diff mbox series

[v3,2/3] soundwire: bus: drop unused driver name field

Message ID 20240712140801.24267-3-johan+linaro@kernel.org (mailing list archive)
State New, archived
Headers show
Series soundwire: bus: suppress probe deferral errors | expand

Commit Message

Johan Hovold July 12, 2024, 2:08 p.m. UTC
The soundwire driver name field is not currently used by any driver (and
even appears to never have been used) so drop it.

Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
 drivers/soundwire/bus_type.c  | 9 ++-------
 include/linux/soundwire/sdw.h | 2 --
 2 files changed, 2 insertions(+), 9 deletions(-)

Comments

Pierre-Louis Bossart July 15, 2024, 9:24 a.m. UTC | #1
On 7/12/24 16:08, Johan Hovold wrote:
> The soundwire driver name field is not currently used by any driver (and
> even appears to never have been used) so drop it.
> 
> Signed-off-by: Johan Hovold <johan+linaro@kernel.org>

Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

> ---
>  drivers/soundwire/bus_type.c  | 9 ++-------
>  include/linux/soundwire/sdw.h | 2 --
>  2 files changed, 2 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/soundwire/bus_type.c b/drivers/soundwire/bus_type.c
> index 85fa5970d98a..3979be0f8b65 100644
> --- a/drivers/soundwire/bus_type.c
> +++ b/drivers/soundwire/bus_type.c
> @@ -198,16 +198,11 @@ static void sdw_drv_shutdown(struct device *dev)
>   */
>  int __sdw_register_driver(struct sdw_driver *drv, struct module *owner)
>  {
> -	const char *name;
> -
>  	drv->driver.bus = &sdw_bus_type;
>  
>  	if (!drv->probe) {
> -		name = drv->name;
> -		if (!name)
> -			name = drv->driver.name;
> -
> -		pr_err("driver %s didn't provide SDW probe routine\n", name);
> +		pr_err("driver %s didn't provide SDW probe routine\n",
> +				drv->driver.name);
>  		return -EINVAL;
>  	}
>  
> diff --git a/include/linux/soundwire/sdw.h b/include/linux/soundwire/sdw.h
> index 13e96d8b7423..5e133dfec8f2 100644
> --- a/include/linux/soundwire/sdw.h
> +++ b/include/linux/soundwire/sdw.h
> @@ -704,8 +704,6 @@ struct sdw_master_device {
>  	container_of(d, struct sdw_master_device, dev)
>  
>  struct sdw_driver {
> -	const char *name;
> -
>  	int (*probe)(struct sdw_slave *sdw,
>  			const struct sdw_device_id *id);
>  	int (*remove)(struct sdw_slave *sdw);
diff mbox series

Patch

diff --git a/drivers/soundwire/bus_type.c b/drivers/soundwire/bus_type.c
index 85fa5970d98a..3979be0f8b65 100644
--- a/drivers/soundwire/bus_type.c
+++ b/drivers/soundwire/bus_type.c
@@ -198,16 +198,11 @@  static void sdw_drv_shutdown(struct device *dev)
  */
 int __sdw_register_driver(struct sdw_driver *drv, struct module *owner)
 {
-	const char *name;
-
 	drv->driver.bus = &sdw_bus_type;
 
 	if (!drv->probe) {
-		name = drv->name;
-		if (!name)
-			name = drv->driver.name;
-
-		pr_err("driver %s didn't provide SDW probe routine\n", name);
+		pr_err("driver %s didn't provide SDW probe routine\n",
+				drv->driver.name);
 		return -EINVAL;
 	}
 
diff --git a/include/linux/soundwire/sdw.h b/include/linux/soundwire/sdw.h
index 13e96d8b7423..5e133dfec8f2 100644
--- a/include/linux/soundwire/sdw.h
+++ b/include/linux/soundwire/sdw.h
@@ -704,8 +704,6 @@  struct sdw_master_device {
 	container_of(d, struct sdw_master_device, dev)
 
 struct sdw_driver {
-	const char *name;
-
 	int (*probe)(struct sdw_slave *sdw,
 			const struct sdw_device_id *id);
 	int (*remove)(struct sdw_slave *sdw);