lkml.org 
[lkml]   [2022]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 0777/1157] soundwire: bus_type: fix remove and shutdown support
    Date
    From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

    [ Upstream commit df6407782964dc7e35ad84230abb38f46314b245 ]

    The bus sdw_drv_remove() and sdw_drv_shutdown() helpers are used
    conditionally, if the driver provides these routines.

    These helpers already test if the driver provides a .remove or
    .shutdown callback, so there's no harm in invoking the
    sdw_drv_remove() and sdw_drv_shutdown() unconditionally.

    In addition, the current code is imbalanced with
    dev_pm_domain_attach() called from sdw_drv_probe(), but
    dev_pm_domain_detach() called from sdw_drv_remove() only if the driver
    provides a .remove callback.

    Fixes: 9251345dca24b ("soundwire: Add SoundWire bus type")
    Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
    Reviewed-by: Rander Wang <rander.wang@intel.com>
    Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
    Link: https://lore.kernel.org/r/20220610015105.25987-1-yung-chuan.liao@linux.intel.com
    Signed-off-by: Vinod Koul <vkoul@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/soundwire/bus_type.c | 8 ++------
    1 file changed, 2 insertions(+), 6 deletions(-)

    diff --git a/drivers/soundwire/bus_type.c b/drivers/soundwire/bus_type.c
    index 893296f3fe39..b81e04dd3a9f 100644
    --- a/drivers/soundwire/bus_type.c
    +++ b/drivers/soundwire/bus_type.c
    @@ -193,12 +193,8 @@ int __sdw_register_driver(struct sdw_driver *drv, struct module *owner)

    drv->driver.owner = owner;
    drv->driver.probe = sdw_drv_probe;
    -
    - if (drv->remove)
    - drv->driver.remove = sdw_drv_remove;
    -
    - if (drv->shutdown)
    - drv->driver.shutdown = sdw_drv_shutdown;
    + drv->driver.remove = sdw_drv_remove;
    + drv->driver.shutdown = sdw_drv_shutdown;

    return driver_register(&drv->driver);
    }
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-16 06:43    [W:2.615 / U:1.696 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site