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@xxxxxxxxxxxxxxx>
---
drivers/base/regmap/regmap-sdw.c | 4 ++--
drivers/soundwire/bus.c | 2 +-
drivers/soundwire/bus_type.c | 9 +++++----
drivers/soundwire/slave.c | 2 +-
include/linux/soundwire/sdw.h | 3 ++-
5 files changed, 11 insertions(+), 9 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 fc53dbe57f85..2f44ed34bd0c 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..071605ca01fa 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);
@@ -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 48a63ca130d2..40e41796a499 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 688b40e65c89..f004de91ce24 100644
--- a/include/linux/soundwire/sdw.h
+++ b/include/linux/soundwire/sdw.h
@@ -561,7 +561,8 @@ struct sdw_slave {
u16 dev_num;
};
-#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
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
