lkml.org 
[lkml]   [2022]   [Mar]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 7/9] i2c: of: use fwnode_get_i2c_adapter_by_node()
    Date
    Since the new fwnode based fwnode_find_i2c_adapter_by_node() function
    has the same behavior than of_get_i2c_adapter_by_node(), call it to
    avoid code duplication.

    Signed-off-by: Clément Léger <clement.leger@bootlin.com>
    ---
    drivers/i2c/i2c-core-of.c | 30 ------------------------------
    include/linux/i2c.h | 5 ++++-
    2 files changed, 4 insertions(+), 31 deletions(-)

    diff --git a/drivers/i2c/i2c-core-of.c b/drivers/i2c/i2c-core-of.c
    index 3ed74aa4b44b..be7d66aa0f49 100644
    --- a/drivers/i2c/i2c-core-of.c
    +++ b/drivers/i2c/i2c-core-of.c
    @@ -113,17 +113,6 @@ void of_i2c_register_devices(struct i2c_adapter *adap)
    of_node_put(bus);
    }

    -static int of_dev_or_parent_node_match(struct device *dev, const void *data)
    -{
    - if (dev->of_node == data)
    - return 1;
    -
    - if (dev->parent)
    - return dev->parent->of_node == data;
    -
    - return 0;
    -}
    -
    /* must call put_device() when done with returned i2c_client device */
    struct i2c_client *of_find_i2c_device_by_node(struct device_node *node)
    {
    @@ -142,25 +131,6 @@ struct i2c_client *of_find_i2c_device_by_node(struct device_node *node)
    }
    EXPORT_SYMBOL(of_find_i2c_device_by_node);

    -/* must call put_device() when done with returned i2c_adapter device */
    -struct i2c_adapter *of_find_i2c_adapter_by_node(struct device_node *node)
    -{
    - struct device *dev;
    - struct i2c_adapter *adapter;
    -
    - dev = bus_find_device(&i2c_bus_type, NULL, node,
    - of_dev_or_parent_node_match);
    - if (!dev)
    - return NULL;
    -
    - adapter = i2c_verify_adapter(dev);
    - if (!adapter)
    - put_device(dev);
    -
    - return adapter;
    -}
    -EXPORT_SYMBOL(of_find_i2c_adapter_by_node);
    -
    /* must call i2c_put_adapter() when done with returned i2c_adapter device */
    struct i2c_adapter *of_get_i2c_adapter_by_node(struct device_node *node)
    {
    diff --git a/include/linux/i2c.h b/include/linux/i2c.h
    index 8dadf8c89fd9..982918fd0093 100644
    --- a/include/linux/i2c.h
    +++ b/include/linux/i2c.h
    @@ -975,7 +975,10 @@ fwnode_find_i2c_adapter_by_node(struct fwnode_handle *fwnode);
    struct i2c_client *of_find_i2c_device_by_node(struct device_node *node);

    /* must call put_device() when done with returned i2c_adapter device */
    -struct i2c_adapter *of_find_i2c_adapter_by_node(struct device_node *node);
    +static inline struct i2c_adapter *of_find_i2c_adapter_by_node(struct device_node *node)
    +{
    + return fwnode_find_i2c_adapter_by_node(of_fwnode_handle(node));
    +}

    /* must call i2c_put_adapter() when done with returned i2c_adapter device */
    struct i2c_adapter *of_get_i2c_adapter_by_node(struct device_node *node);
    --
    2.34.1
    \
     
     \ /
      Last update: 2022-03-25 12:35    [W:4.308 / U:25.480 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site