Re: [PATCH] nvmem: core: Add stubs for nvmem_cell_read_variable_le_u32/64 if !CONFIG_NVMEM

From: Bjorn Andersson
Date: Mon Aug 30 2021 - 12:42:53 EST


On Mon 30 Aug 10:35 CDT 2021, Douglas Anderson wrote:

> When I added nvmem_cell_read_variable_le_u32() and
> nvmem_cell_read_variable_le_u64() I forgot to add the "static inline"
> stub functions for when CONFIG_NVMEM wasn't defined. Add them
> now. This was causing problems with randconfig builds that compiled
> `drivers/soc/qcom/cpr.c`.
>
> Fixes: 6feba6a62c57 ("PM: AVS: qcom-cpr: Use nvmem_cell_read_variable_le_u32()")
> Fixes: a28e824fb827 ("nvmem: core: Add functions to make number reading easy")
> Reported-by: kernel test robot <lkp@xxxxxxxxx>
> Signed-off-by: Douglas Anderson <dianders@xxxxxxxxxxxx>

Reviewed-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx>

> ---
> It might be handy if this commit could somehow end up in the SoC tree
> soon-ish to fix the build warning. I expect that the "qcom-cpr" patch
> will be part of the pull requests send in the next merge window and
> it'd be nice if we didn't end up with the build warning in -rc1.
>

Right, CPR is about to break some builds in -rc1, so it would be nice to
get this in asap.

That said, the qcom pull is in the pipes already, so pushing it through
Srinivas tree will work just fine.

Thanks,
Bjorn

> include/linux/nvmem-consumer.h | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
> diff --git a/include/linux/nvmem-consumer.h b/include/linux/nvmem-consumer.h
> index 923dada24eb4..c0c0cefc3b92 100644
> --- a/include/linux/nvmem-consumer.h
> +++ b/include/linux/nvmem-consumer.h
> @@ -150,6 +150,20 @@ static inline int nvmem_cell_read_u64(struct device *dev,
> return -EOPNOTSUPP;
> }
>
> +static inline int nvmem_cell_read_variable_le_u32(struct device *dev,
> + const char *cell_id,
> + u32 *val)
> +{
> + return -EOPNOTSUPP;
> +}
> +
> +static inline int nvmem_cell_read_variable_le_u64(struct device *dev,
> + const char *cell_id,
> + u64 *val)
> +{
> + return -EOPNOTSUPP;
> +}
> +
> static inline struct nvmem_device *nvmem_device_get(struct device *dev,
> const char *name)
> {
> --
> 2.33.0.259.gc128427fd7-goog
>