[alsa-devel] [PATCH v5 03/17] soundwire: rename drv_to_sdw_slave_driver macro

Vinod Koul vkoul at kernel.org
Sat Dec 28 13:03:17 CET 2019


On 27-12-19, 17:23, Pierre-Louis Bossart wrote:
> 
> 
> On 12/27/19 1:00 AM, Vinod Koul wrote:
> > On 17-12-19, 15:03, Pierre-Louis Bossart wrote:
> > > Align with previous renames and shorten macro
> > > 
> > > No functionality change
> > > 
> > > Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart at 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);
> > 
> > so patch 1 does:
> > 
> > -       struct sdw_driver *drv = drv_to_sdw_driver(dev->driver);
> > +       struct sdw_driver *drv = drv_to_sdw_slave_driver(dev->driver);
> > 
> > and here we move drv_to_sdw_slave_driver to to_sdw_slave_driver... why
> > not do this in first patch and save step1... or did i miss something??
> 
> because patch1 introduces replaces 'sdw_' by 'sdw_slave_' in several places,
> not just for drv_to_sdw_driver()
> 
> I can squash all these patches if you want to but then you'll tell me one
> step at a time...

Yes but that does not mean we add an intermediate step just to remove it
later... So please remove the instances of drv_to_sdw_slave_driver() in
patch1 and move them to patch3 (this) and convert to
to_sdw_slave_driver()

Thanks
-- 
~Vinod


More information about the Alsa-devel mailing list