From: Vinod Koul <vkoul@kernel.org> To: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>, broonie@kernel.org Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, tiwai@suse.de, gregkh@linuxfoundation.org, jank@cadence.com, srinivas.kandagatla@linaro.org, slawomir.blauciak@intel.com, Bard liao <yung-chuan.liao@linux.intel.com>, Rander Wang <rander.wang@linux.intel.com>, Ranjani Sridharan <ranjani.sridharan@linux.intel.com>, "Rafael J. Wysocki" <rafael@kernel.org>, Sanyog Kale <sanyog.r.kale@intel.com> Subject: Re: [PATCH v5 02/17] soundwire: rename dev_to_sdw_dev macro Date: Fri, 27 Dec 2019 12:24:30 +0530 [thread overview] Message-ID: <20191227065430.GI3006@vkoul-mobl> (raw) In-Reply-To: <20191217210314.20410-3-pierre-louis.bossart@linux.intel.com> On 17-12-19, 15:02, Pierre-Louis Bossart wrote: > Since we want to introduce master devices, rename macro so that we > have consistency between slave and master device access. > > Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > --- > drivers/base/regmap/regmap-sdw.c | 4 ++-- need ack from Mark on this... > drivers/soundwire/bus.c | 2 +- > drivers/soundwire/bus_type.c | 11 ++++++----- > drivers/soundwire/slave.c | 2 +- > include/linux/soundwire/sdw.h | 3 ++- > 5 files changed, 12 insertions(+), 10 deletions(-) > > diff --git a/drivers/base/regmap/regmap-sdw.c b/drivers/base/regmap/regmap-sdw.c > index 50a66382d87d..d1fc0c22180a 100644 > --- a/drivers/base/regmap/regmap-sdw.c > +++ b/drivers/base/regmap/regmap-sdw.c > @@ -10,7 +10,7 @@ > static int regmap_sdw_write(void *context, unsigned int reg, unsigned int val) > { > struct device *dev = context; > - struct sdw_slave *slave = dev_to_sdw_dev(dev); > + struct sdw_slave *slave = to_sdw_slave_device(dev); > > return sdw_write(slave, reg, val); > } > @@ -18,7 +18,7 @@ static int regmap_sdw_write(void *context, unsigned int reg, unsigned int val) > static int regmap_sdw_read(void *context, unsigned int reg, unsigned int *val) > { > struct device *dev = context; > - struct sdw_slave *slave = dev_to_sdw_dev(dev); > + struct sdw_slave *slave = to_sdw_slave_device(dev); > int read; > > read = sdw_read(slave, reg); > diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c > index be5d437058ed..4b22ee996a65 100644 > --- a/drivers/soundwire/bus.c > +++ b/drivers/soundwire/bus.c > @@ -110,7 +110,7 @@ EXPORT_SYMBOL(sdw_add_bus_master); > > static int sdw_delete_slave(struct device *dev, void *data) > { > - struct sdw_slave *slave = dev_to_sdw_dev(dev); > + struct sdw_slave *slave = to_sdw_slave_device(dev); > struct sdw_bus *bus = slave->bus; > > sdw_slave_debugfs_exit(slave); > diff --git a/drivers/soundwire/bus_type.c b/drivers/soundwire/bus_type.c > index 370b94752662..c0585bcc8a41 100644 > --- a/drivers/soundwire/bus_type.c > +++ b/drivers/soundwire/bus_type.c > @@ -33,7 +33,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 = dev_to_sdw_dev(dev); > + struct sdw_slave *slave = to_sdw_slave_device(dev); > struct sdw_driver *drv = drv_to_sdw_slave_driver(ddrv); > > return !!sdw_get_device_id(slave, drv); > @@ -49,7 +49,7 @@ int sdw_slave_modalias(const struct sdw_slave *slave, char *buf, size_t size) > > static int sdw_uevent(struct device *dev, struct kobj_uevent_env *env) > { > - struct sdw_slave *slave = dev_to_sdw_dev(dev); > + struct sdw_slave *slave = to_sdw_slave_device(dev); > char modalias[32]; > > sdw_slave_modalias(slave, modalias, sizeof(modalias)); > @@ -69,7 +69,7 @@ EXPORT_SYMBOL_GPL(sdw_bus_type); > > static int sdw_drv_probe(struct device *dev) > { > - struct sdw_slave *slave = dev_to_sdw_dev(dev); > + struct sdw_slave *slave = to_sdw_slave_device(dev); > struct sdw_driver *drv = drv_to_sdw_slave_driver(dev->driver); > const struct sdw_device_id *id; > int ret; > @@ -115,8 +115,9 @@ static int sdw_drv_probe(struct device *dev) > > static int sdw_drv_remove(struct device *dev) > { > - struct sdw_slave *slave = dev_to_sdw_dev(dev); > + struct sdw_slave *slave = to_sdw_slave_device(dev); > struct sdw_driver *drv = drv_to_sdw_slave_driver(dev->driver); > + > int ret = 0; > > if (drv->remove) > @@ -129,7 +130,7 @@ static int sdw_drv_remove(struct device *dev) > > static void sdw_drv_shutdown(struct device *dev) > { > - struct sdw_slave *slave = dev_to_sdw_dev(dev); > + struct sdw_slave *slave = to_sdw_slave_device(dev); > struct sdw_driver *drv = drv_to_sdw_slave_driver(dev->driver); > > if (drv->shutdown) > diff --git a/drivers/soundwire/slave.c b/drivers/soundwire/slave.c > index 19919975bb6d..48a513680db6 100644 > --- a/drivers/soundwire/slave.c > +++ b/drivers/soundwire/slave.c > @@ -9,7 +9,7 @@ > > static void sdw_slave_release(struct device *dev) > { > - struct sdw_slave *slave = dev_to_sdw_dev(dev); > + struct sdw_slave *slave = to_sdw_slave_device(dev); > > kfree(slave); > } > diff --git a/include/linux/soundwire/sdw.h b/include/linux/soundwire/sdw.h > index b7c9eca4332a..5b1180f1e6b5 100644 > --- a/include/linux/soundwire/sdw.h > +++ b/include/linux/soundwire/sdw.h > @@ -582,7 +582,8 @@ struct sdw_slave { > u32 unattach_request; > }; > > -#define dev_to_sdw_dev(_dev) container_of(_dev, struct sdw_slave, dev) > +#define to_sdw_slave_device(d) \ > + container_of(d, struct sdw_slave, dev) > > struct sdw_driver { > const char *name; > -- > 2.20.1 -- ~Vinod
WARNING: multiple messages have this Message-ID (diff)
From: Vinod Koul <vkoul@kernel.org> To: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>, broonie@kernel.org Cc: alsa-devel@alsa-project.org, "Rafael J. Wysocki" <rafael@kernel.org>, tiwai@suse.de, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, Ranjani Sridharan <ranjani.sridharan@linux.intel.com>, srinivas.kandagatla@linaro.org, jank@cadence.com, slawomir.blauciak@intel.com, Sanyog Kale <sanyog.r.kale@intel.com>, Bard liao <yung-chuan.liao@linux.intel.com>, Rander Wang <rander.wang@linux.intel.com> Subject: Re: [alsa-devel] [PATCH v5 02/17] soundwire: rename dev_to_sdw_dev macro Date: Fri, 27 Dec 2019 12:24:30 +0530 [thread overview] Message-ID: <20191227065430.GI3006@vkoul-mobl> (raw) In-Reply-To: <20191217210314.20410-3-pierre-louis.bossart@linux.intel.com> On 17-12-19, 15:02, Pierre-Louis Bossart wrote: > Since we want to introduce master devices, rename macro so that we > have consistency between slave and master device access. > > Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > --- > drivers/base/regmap/regmap-sdw.c | 4 ++-- need ack from Mark on this... > drivers/soundwire/bus.c | 2 +- > drivers/soundwire/bus_type.c | 11 ++++++----- > drivers/soundwire/slave.c | 2 +- > include/linux/soundwire/sdw.h | 3 ++- > 5 files changed, 12 insertions(+), 10 deletions(-) > > diff --git a/drivers/base/regmap/regmap-sdw.c b/drivers/base/regmap/regmap-sdw.c > index 50a66382d87d..d1fc0c22180a 100644 > --- a/drivers/base/regmap/regmap-sdw.c > +++ b/drivers/base/regmap/regmap-sdw.c > @@ -10,7 +10,7 @@ > static int regmap_sdw_write(void *context, unsigned int reg, unsigned int val) > { > struct device *dev = context; > - struct sdw_slave *slave = dev_to_sdw_dev(dev); > + struct sdw_slave *slave = to_sdw_slave_device(dev); > > return sdw_write(slave, reg, val); > } > @@ -18,7 +18,7 @@ static int regmap_sdw_write(void *context, unsigned int reg, unsigned int val) > static int regmap_sdw_read(void *context, unsigned int reg, unsigned int *val) > { > struct device *dev = context; > - struct sdw_slave *slave = dev_to_sdw_dev(dev); > + struct sdw_slave *slave = to_sdw_slave_device(dev); > int read; > > read = sdw_read(slave, reg); > diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c > index be5d437058ed..4b22ee996a65 100644 > --- a/drivers/soundwire/bus.c > +++ b/drivers/soundwire/bus.c > @@ -110,7 +110,7 @@ EXPORT_SYMBOL(sdw_add_bus_master); > > static int sdw_delete_slave(struct device *dev, void *data) > { > - struct sdw_slave *slave = dev_to_sdw_dev(dev); > + struct sdw_slave *slave = to_sdw_slave_device(dev); > struct sdw_bus *bus = slave->bus; > > sdw_slave_debugfs_exit(slave); > diff --git a/drivers/soundwire/bus_type.c b/drivers/soundwire/bus_type.c > index 370b94752662..c0585bcc8a41 100644 > --- a/drivers/soundwire/bus_type.c > +++ b/drivers/soundwire/bus_type.c > @@ -33,7 +33,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 = dev_to_sdw_dev(dev); > + struct sdw_slave *slave = to_sdw_slave_device(dev); > struct sdw_driver *drv = drv_to_sdw_slave_driver(ddrv); > > return !!sdw_get_device_id(slave, drv); > @@ -49,7 +49,7 @@ int sdw_slave_modalias(const struct sdw_slave *slave, char *buf, size_t size) > > static int sdw_uevent(struct device *dev, struct kobj_uevent_env *env) > { > - struct sdw_slave *slave = dev_to_sdw_dev(dev); > + struct sdw_slave *slave = to_sdw_slave_device(dev); > char modalias[32]; > > sdw_slave_modalias(slave, modalias, sizeof(modalias)); > @@ -69,7 +69,7 @@ EXPORT_SYMBOL_GPL(sdw_bus_type); > > static int sdw_drv_probe(struct device *dev) > { > - struct sdw_slave *slave = dev_to_sdw_dev(dev); > + struct sdw_slave *slave = to_sdw_slave_device(dev); > struct sdw_driver *drv = drv_to_sdw_slave_driver(dev->driver); > const struct sdw_device_id *id; > int ret; > @@ -115,8 +115,9 @@ static int sdw_drv_probe(struct device *dev) > > static int sdw_drv_remove(struct device *dev) > { > - struct sdw_slave *slave = dev_to_sdw_dev(dev); > + struct sdw_slave *slave = to_sdw_slave_device(dev); > struct sdw_driver *drv = drv_to_sdw_slave_driver(dev->driver); > + > int ret = 0; > > if (drv->remove) > @@ -129,7 +130,7 @@ static int sdw_drv_remove(struct device *dev) > > static void sdw_drv_shutdown(struct device *dev) > { > - struct sdw_slave *slave = dev_to_sdw_dev(dev); > + struct sdw_slave *slave = to_sdw_slave_device(dev); > struct sdw_driver *drv = drv_to_sdw_slave_driver(dev->driver); > > if (drv->shutdown) > diff --git a/drivers/soundwire/slave.c b/drivers/soundwire/slave.c > index 19919975bb6d..48a513680db6 100644 > --- a/drivers/soundwire/slave.c > +++ b/drivers/soundwire/slave.c > @@ -9,7 +9,7 @@ > > static void sdw_slave_release(struct device *dev) > { > - struct sdw_slave *slave = dev_to_sdw_dev(dev); > + struct sdw_slave *slave = to_sdw_slave_device(dev); > > kfree(slave); > } > diff --git a/include/linux/soundwire/sdw.h b/include/linux/soundwire/sdw.h > index b7c9eca4332a..5b1180f1e6b5 100644 > --- a/include/linux/soundwire/sdw.h > +++ b/include/linux/soundwire/sdw.h > @@ -582,7 +582,8 @@ struct sdw_slave { > u32 unattach_request; > }; > > -#define dev_to_sdw_dev(_dev) container_of(_dev, struct sdw_slave, dev) > +#define to_sdw_slave_device(d) \ > + container_of(d, struct sdw_slave, dev) > > struct sdw_driver { > const char *name; > -- > 2.20.1 -- ~Vinod _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
next prev parent reply other threads:[~2019-12-27 6:54 UTC|newest] Thread overview: 94+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-12-17 21:02 [PATCH v5 00/17] soundwire: intel: implement new ASoC interfaces Pierre-Louis Bossart 2019-12-17 21:02 ` [alsa-devel] " Pierre-Louis Bossart 2019-12-17 21:02 ` [PATCH v5 01/17] soundwire: renames to prepare support for master drivers/devices Pierre-Louis Bossart 2019-12-17 21:02 ` [alsa-devel] " Pierre-Louis Bossart 2019-12-17 21:02 ` [PATCH v5 02/17] soundwire: rename dev_to_sdw_dev macro Pierre-Louis Bossart 2019-12-17 21:02 ` [alsa-devel] " Pierre-Louis Bossart 2019-12-27 6:54 ` Vinod Koul [this message] 2019-12-27 6:54 ` Vinod Koul 2019-12-17 21:03 ` [PATCH v5 03/17] soundwire: rename drv_to_sdw_slave_driver macro Pierre-Louis Bossart 2019-12-17 21:03 ` [alsa-devel] " Pierre-Louis Bossart 2019-12-27 7:00 ` Vinod Koul 2019-12-27 7:00 ` [alsa-devel] " Vinod Koul 2019-12-27 23:23 ` Pierre-Louis Bossart 2019-12-27 23:23 ` Pierre-Louis Bossart 2019-12-28 12:03 ` Vinod Koul 2019-12-28 12:03 ` Vinod Koul 2019-12-17 21:03 ` [PATCH v5 04/17] soundwire: bus_type: rename sdw_drv_ to sdw_slave_drv Pierre-Louis Bossart 2019-12-17 21:03 ` [alsa-devel] " Pierre-Louis Bossart 2019-12-17 21:03 ` [PATCH v5 05/17] soundwire: intel: rename res field as link_res Pierre-Louis Bossart 2019-12-17 21:03 ` [alsa-devel] " Pierre-Louis Bossart 2019-12-17 21:03 ` [PATCH v5 06/17] soundwire: add support for sdw_slave_type Pierre-Louis Bossart 2019-12-17 21:03 ` [alsa-devel] " Pierre-Louis Bossart 2019-12-27 7:03 ` Vinod Koul 2019-12-27 7:03 ` [alsa-devel] " Vinod Koul 2019-12-27 23:26 ` Pierre-Louis Bossart 2019-12-27 23:26 ` Pierre-Louis Bossart 2019-12-28 12:05 ` Vinod Koul 2019-12-28 12:05 ` Vinod Koul 2019-12-17 21:03 ` [PATCH v5 07/17] soundwire: slave: move uevent handling to slave device level Pierre-Louis Bossart 2019-12-17 21:03 ` [alsa-devel] " Pierre-Louis Bossart 2019-12-17 21:03 ` [PATCH v5 08/17] soundwire: add initial definitions for sdw_master_device Pierre-Louis Bossart 2019-12-17 21:03 ` [alsa-devel] " Pierre-Louis Bossart 2019-12-27 7:14 ` Vinod Koul 2019-12-27 7:14 ` [alsa-devel] " Vinod Koul 2019-12-27 23:38 ` Pierre-Louis Bossart 2019-12-27 23:38 ` Pierre-Louis Bossart 2019-12-28 12:09 ` Vinod Koul 2019-12-28 12:09 ` Vinod Koul 2020-01-02 17:36 ` Pierre-Louis Bossart 2020-01-02 17:36 ` Pierre-Louis Bossart 2020-01-06 5:32 ` Vinod Koul 2020-01-06 5:32 ` Vinod Koul 2019-12-17 21:03 ` [PATCH v5 09/17] soundwire: intel: remove platform devices and use 'Master Devices' instead Pierre-Louis Bossart 2019-12-17 21:03 ` [alsa-devel] " Pierre-Louis Bossart 2019-12-27 9:08 ` Vinod Koul 2019-12-27 9:08 ` [alsa-devel] " Vinod Koul 2019-12-28 0:13 ` Pierre-Louis Bossart 2019-12-28 0:13 ` Pierre-Louis Bossart 2020-01-06 5:42 ` Vinod Koul 2020-01-06 5:42 ` Vinod Koul 2020-01-06 14:51 ` Pierre-Louis Bossart 2020-01-06 14:51 ` Pierre-Louis Bossart 2020-01-10 6:43 ` Vinod Koul 2020-01-10 6:43 ` Vinod Koul 2020-01-10 16:08 ` Pierre-Louis Bossart 2020-01-10 16:08 ` Pierre-Louis Bossart 2020-01-13 5:18 ` Vinod Koul 2020-01-13 5:18 ` Vinod Koul 2020-01-13 15:22 ` Pierre-Louis Bossart 2020-01-13 15:22 ` Pierre-Louis Bossart 2020-01-14 6:09 ` Vinod Koul 2020-01-14 6:09 ` [alsa-devel] " Vinod Koul 2020-01-14 16:01 ` Pierre-Louis Bossart 2020-01-14 16:01 ` Pierre-Louis Bossart 2020-01-18 7:12 ` Vinod Koul 2020-01-18 7:12 ` Vinod Koul 2020-01-21 17:31 ` Pierre-Louis Bossart 2020-01-21 17:31 ` Pierre-Louis Bossart 2020-01-28 10:50 ` Vinod Koul 2020-01-28 10:50 ` Vinod Koul 2020-01-28 16:02 ` Pierre-Louis Bossart 2020-01-28 16:02 ` Pierre-Louis Bossart 2020-01-29 5:08 ` Vinod Koul 2020-01-29 5:08 ` Vinod Koul 2020-01-29 14:59 ` Pierre-Louis Bossart 2020-01-29 14:59 ` Pierre-Louis Bossart 2020-02-03 12:02 ` Vinod Koul 2020-02-03 12:02 ` Vinod Koul 2019-12-17 21:03 ` [PATCH v5 10/17] soundwire: register master device driver Pierre-Louis Bossart 2019-12-17 21:03 ` [alsa-devel] " Pierre-Louis Bossart 2019-12-17 21:03 ` [PATCH v5 11/17] soundwire: intel: add prepare support in sdw dai driver Pierre-Louis Bossart 2019-12-17 21:03 ` [alsa-devel] " Pierre-Louis Bossart 2019-12-17 21:03 ` [PATCH v5 12/17] soundwire: intel: add trigger " Pierre-Louis Bossart 2019-12-17 21:03 ` [alsa-devel] " Pierre-Louis Bossart 2019-12-17 21:03 ` [PATCH v5 13/17] soundwire: intel: add sdw_stream_setup helper for .startup callback Pierre-Louis Bossart 2019-12-17 21:03 ` [alsa-devel] " Pierre-Louis Bossart 2019-12-17 21:03 ` [PATCH v5 14/17] soundwire: intel: free all resources on hw_free() Pierre-Louis Bossart 2019-12-17 21:03 ` [alsa-devel] " Pierre-Louis Bossart 2019-12-17 21:03 ` [PATCH v5 15/17] soundwire: intel_init: add implementation of sdw_intel_enable_irq() Pierre-Louis Bossart 2019-12-17 21:03 ` [alsa-devel] " Pierre-Louis Bossart 2019-12-17 21:03 ` [PATCH v5 16/17] soundwire: intel_init: use EXPORT_SYMBOL_NS Pierre-Louis Bossart 2019-12-17 21:03 ` [alsa-devel] " Pierre-Louis Bossart 2019-12-17 21:03 ` [PATCH v5 17/17] soundwire: intel: " Pierre-Louis Bossart 2019-12-17 21:03 ` [alsa-devel] " Pierre-Louis Bossart
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191227065430.GI3006@vkoul-mobl \ --to=vkoul@kernel.org \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=gregkh@linuxfoundation.org \ --cc=jank@cadence.com \ --cc=linux-kernel@vger.kernel.org \ --cc=pierre-louis.bossart@linux.intel.com \ --cc=rafael@kernel.org \ --cc=rander.wang@linux.intel.com \ --cc=ranjani.sridharan@linux.intel.com \ --cc=sanyog.r.kale@intel.com \ --cc=slawomir.blauciak@intel.com \ --cc=srinivas.kandagatla@linaro.org \ --cc=tiwai@suse.de \ --cc=yung-chuan.liao@linux.intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.