lkml.org 
[lkml]   [2018]   [Aug]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.17 224/336] regulator: add dummy function of_find_regulator_by_node
    Date
    4.17-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Changbin Du <changbin.du@intel.com>

    [ Upstream commit 08813e0ec1cb48e53c86a24d88d26b26878e7b6e ]

    If device tree is not enabled, of_find_regulator_by_node() should have
    a dummy function since the function call is still there.

    This is to fix build error after CONFIG_NO_AUTO_INLINE is introduced.
    If this option is enabled, GCC will not auto-inline functions that are
    not explicitly marked as inline.

    In this case (no CONFIG_OF), the copmiler will report error in function
    regulator_dev_lookup().

    W/O NO_AUTO_INLINE, function of_get_regulator() is auto-inlined and then
    the call to of_find_regulator_by_node() is optimized out since
    of_get_regulator() always return NULL.

    W/ NO_AUTO_INLINE, the return value of of_get_regulator() is a variable
    so the call to of_find_regulator_by_node() cannot be optimized out. So
    we need a stub of_find_regulator_by_node().

    static struct regulator_dev *regulator_dev_lookup(struct device *dev,
    const char *supply)
    {
    struct regulator_dev *r = NULL;
    struct device_node *node;
    struct regulator_map *map;
    const char *devname = NULL;

    regulator_supply_alias(&dev, &supply);

    /* first do a dt based lookup */
    if (dev && dev->of_node) {
    node = of_get_regulator(dev, supply);
    if (node) {
    r = of_find_regulator_by_node(node);
    if (r)
    return r;
    ...

    Signed-off-by: Changbin Du <changbin.du@intel.com>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/regulator/internal.h | 9 +++++++--
    1 file changed, 7 insertions(+), 2 deletions(-)

    --- a/drivers/regulator/internal.h
    +++ b/drivers/regulator/internal.h
    @@ -56,14 +56,19 @@ static inline struct regulator_dev *dev_
    return container_of(dev, struct regulator_dev, dev);
    }

    -struct regulator_dev *of_find_regulator_by_node(struct device_node *np);
    -
    #ifdef CONFIG_OF
    +struct regulator_dev *of_find_regulator_by_node(struct device_node *np);
    struct regulator_init_data *regulator_of_get_init_data(struct device *dev,
    const struct regulator_desc *desc,
    struct regulator_config *config,
    struct device_node **node);
    #else
    +static inline struct regulator_dev *
    +of_find_regulator_by_node(struct device_node *np)
    +{
    + return NULL;
    +}
    +
    static inline struct regulator_init_data *
    regulator_of_get_init_data(struct device *dev,
    const struct regulator_desc *desc,

    \
     
     \ /
      Last update: 2018-08-01 20:03    [W:4.028 / U:0.348 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site