From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: linux-kernel@vger.kernel.org, tiwai@suse.de, broonie@kernel.org,
vkoul@kernel.org, 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>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
Sanyog Kale <sanyog.r.kale@intel.com>
Subject: [RFC PATCH 3/9] soundwire: rename drv_to_sdw_slave_driver macro
Date: Mon, 16 Sep 2019 16:23:36 -0500 [thread overview]
Message-ID: <20190916212342.12578-4-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20190916212342.12578-1-pierre-louis.bossart@linux.intel.com>
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 071605ca01fa..ae56fdd434af 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
next prev parent reply other threads:[~2019-09-16 21:23 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-16 21:23 [RFC PATCH 0/9] soundwire: add Master device support, GreyBus style Pierre-Louis Bossart
2019-09-16 21:23 ` [RFC PATCH 1/9] soundwire: renames to prepare support for master drivers/devices Pierre-Louis Bossart
2019-09-16 21:23 ` [RFC PATCH 2/9] soundwire: rename dev_to_sdw_dev macro Pierre-Louis Bossart
2019-09-16 21:23 ` Pierre-Louis Bossart [this message]
2019-09-16 21:23 ` [RFC PATCH 4/9] soundwire: bus_type: rename sdw_drv_ to sdw_slave_drv Pierre-Louis Bossart
2019-09-16 21:23 ` [RFC PATCH 5/9] soundwire: intel: rename res field as link_res Pierre-Louis Bossart
2019-09-16 21:23 ` [RFC PATCH 6/9] soundwire: add support for sdw_slave_type Pierre-Louis Bossart
2019-09-16 21:23 ` [RFC PATCH 7/9] soundwire: add initial definitions for sdw_master_device Pierre-Louis Bossart
2019-09-16 21:23 ` [RFC PATCH 8/9] soundwire: intel: remove platform devices and provide new interface Pierre-Louis Bossart
2019-09-17 5:55 ` Greg KH
2019-09-17 14:29 ` [alsa-devel] " Pierre-Louis Bossart
2019-09-18 12:06 ` Greg KH
2019-09-18 13:48 ` Pierre-Louis Bossart
2019-09-18 13:53 ` Greg KH
2019-09-18 13:54 ` Greg KH
2019-09-18 15:14 ` Pierre-Louis Bossart
2019-09-18 19:50 ` Greg KH
2019-09-16 21:23 ` [RFC PATCH 9/9] soundwire: add device driver to sdw_md_driver 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=20190916212342.12578-4-pierre-louis.bossart@linux.intel.com \
--to=pierre-louis.bossart@linux.intel.com \
--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=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=vkoul@kernel.org \
--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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).