lkml.org 
[lkml]   [2019]   [Oct]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/14] soundwire: rename drv_to_sdw_slave_driver macro
    Date
    Align with previous renames and shorten macro

    No functionality change

    Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
    ---
    drivers/soundwire/bus_type.c | 9 ++++-----
    include/linux/soundwire/sdw_type.h | 3 ++-
    2 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/drivers/soundwire/bus_type.c b/drivers/soundwire/bus_type.c
    index c0585bcc8a41..2b2830b622fa 100644
    --- a/drivers/soundwire/bus_type.c
    +++ b/drivers/soundwire/bus_type.c
    @@ -34,7 +34,7 @@ sdw_get_device_id(struct sdw_slave *slave, struct sdw_driver *drv)
    static int sdw_bus_match(struct device *dev, struct device_driver *ddrv)
    {
    struct sdw_slave *slave = to_sdw_slave_device(dev);
    - struct sdw_driver *drv = drv_to_sdw_slave_driver(ddrv);
    + struct sdw_driver *drv = to_sdw_slave_driver(ddrv);

    return !!sdw_get_device_id(slave, drv);
    }
    @@ -70,7 +70,7 @@ EXPORT_SYMBOL_GPL(sdw_bus_type);
    static int sdw_drv_probe(struct device *dev)
    {
    struct sdw_slave *slave = to_sdw_slave_device(dev);
    - struct sdw_driver *drv = drv_to_sdw_slave_driver(dev->driver);
    + struct sdw_driver *drv = to_sdw_slave_driver(dev->driver);
    const struct sdw_device_id *id;
    int ret;

    @@ -116,8 +116,7 @@ static int sdw_drv_probe(struct device *dev)
    static int sdw_drv_remove(struct device *dev)
    {
    struct sdw_slave *slave = to_sdw_slave_device(dev);
    - struct sdw_driver *drv = drv_to_sdw_slave_driver(dev->driver);
    -
    + struct sdw_driver *drv = to_sdw_slave_driver(dev->driver);
    int ret = 0;

    if (drv->remove)
    @@ -131,7 +130,7 @@ static int sdw_drv_remove(struct device *dev)
    static void sdw_drv_shutdown(struct device *dev)
    {
    struct sdw_slave *slave = to_sdw_slave_device(dev);
    - struct sdw_driver *drv = drv_to_sdw_slave_driver(dev->driver);
    + struct sdw_driver *drv = to_sdw_slave_driver(dev->driver);

    if (drv->shutdown)
    drv->shutdown(slave);
    diff --git a/include/linux/soundwire/sdw_type.h b/include/linux/soundwire/sdw_type.h
    index abaa21278152..7d4bc6a979bf 100644
    --- a/include/linux/soundwire/sdw_type.h
    +++ b/include/linux/soundwire/sdw_type.h
    @@ -6,7 +6,7 @@

    extern struct bus_type sdw_bus_type;

    -#define drv_to_sdw_slave_driver(_drv) \
    +#define to_sdw_slave_driver(_drv) \
    container_of(_drv, struct sdw_driver, driver)

    #define sdw_register_slave_driver(drv) \
    @@ -29,4 +29,5 @@ int sdw_slave_modalias(const struct sdw_slave *slave, char *buf, size_t size);
    #define module_sdw_driver(__sdw_slave_driver) \
    module_driver(__sdw_slave_driver, sdw_register_slave_driver, \
    sdw_unregister_slave_driver)
    +
    #endif /* __SOUNDWIRE_TYPES_H */
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-10-23 23:29    [W:4.532 / U:0.268 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site