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>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Sanyog Kale <sanyog.r.kale@intel.com>
Subject: [PATCH v2 02/14] soundwire: rename dev_to_sdw_dev macro
Date: Wed, 6 Nov 2019 13:13:46 -0600 [thread overview]
Message-ID: <20191106191358.5712-3-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20191106191358.5712-1-pierre-louis.bossart@linux.intel.com>
Since we want to introduce master devices, rename macro so that we
have consistency between slave and master device access, following the
Grey Bus example.
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
drivers/base/regmap/regmap-sdw.c | 4 ++--
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 a58939d3b611..3b618d7e6641 100644
--- a/include/linux/soundwire/sdw.h
+++ b/include/linux/soundwire/sdw.h
@@ -576,7 +576,8 @@ struct sdw_slave {
struct completion initialization_complete;
};
-#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
next prev parent reply other threads:[~2019-11-06 19:14 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-06 19:13 [PATCH v2 00/14] soundwire: intel: implement new ASoC interfaces Pierre-Louis Bossart
2019-11-06 19:13 ` [PATCH v2 01/14] soundwire: renames to prepare support for master drivers/devices Pierre-Louis Bossart
2019-11-06 19:13 ` Pierre-Louis Bossart [this message]
2019-11-06 19:13 ` [PATCH v2 03/14] soundwire: rename drv_to_sdw_slave_driver macro Pierre-Louis Bossart
2019-11-06 19:13 ` [PATCH v2 04/14] soundwire: bus_type: rename sdw_drv_ to sdw_slave_drv Pierre-Louis Bossart
2019-11-06 19:13 ` [PATCH v2 05/14] soundwire: intel: rename res field as link_res Pierre-Louis Bossart
2019-11-06 19:13 ` [PATCH v2 06/14] soundwire: add support for sdw_slave_type Pierre-Louis Bossart
2019-11-06 19:13 ` [PATCH v2 07/14] soundwire: add initial definitions for sdw_master_device Pierre-Louis Bossart
2019-11-06 19:13 ` [PATCH v2 08/14] soundwire: intel: remove platform devices and provide new interface Pierre-Louis Bossart
2019-11-06 19:13 ` [PATCH v2 09/14] soundwire: add device driver to sdw_md_driver Pierre-Louis Bossart
2019-11-06 19:13 ` [PATCH v2 10/14] soundwire: intel: add prepare support in sdw dai driver Pierre-Louis Bossart
2019-11-06 19:13 ` [PATCH v2 11/14] soundwire: intel: add trigger " Pierre-Louis Bossart
2019-11-06 19:13 ` [PATCH v2 12/14] soundwire: intel: add sdw_stream_setup helper for .startup callback Pierre-Louis Bossart
2019-11-06 19:13 ` [PATCH v2 13/14] soundwire: intel: free all resources on hw_free() Pierre-Louis Bossart
2019-11-06 19:13 ` [PATCH v2 14/14] soundwire: intel_init: add implementation of sdw_intel_enable_irq() 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=20191106191358.5712-3-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=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=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).