From: Johan Hovold <johan+linaro@kernel.org>
To: Vinod Koul <vkoul@kernel.org>
Cc: Bard Liao <yung-chuan.liao@linux.intel.com>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
Sanyog Kale <sanyog.r.kale@intel.com>,
alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org,
Johan Hovold <johan+linaro@kernel.org>
Subject: [PATCH v2 2/4] soundwire: bus: drop unused driver name field
Date: Tue, 4 Jun 2024 09:52:11 +0200 [thread overview]
Message-ID: <20240604075213.20815-3-johan+linaro@kernel.org> (raw)
In-Reply-To: <20240604075213.20815-1-johan+linaro@kernel.org>
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(-)
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);
--
2.44.1
next prev parent reply other threads:[~2024-06-04 7:52 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-04 7:52 [PATCH v2 0/4] soundwire: bus: suppress probe deferral errors Johan Hovold
2024-06-04 7:52 ` [PATCH v2 1/4] " Johan Hovold
2024-06-04 8:30 ` Pierre-Louis Bossart
2024-06-04 9:09 ` Johan Hovold
2024-06-04 13:29 ` Pierre-Louis Bossart
2024-06-04 7:52 ` Johan Hovold [this message]
2024-06-04 7:52 ` [PATCH v2 3/4] soundwire: bus: clean up probe warnings Johan Hovold
2024-06-04 8:33 ` Pierre-Louis Bossart
2024-06-04 9:17 ` Johan Hovold
2024-06-04 13:43 ` Pierre-Louis Bossart
2024-06-04 14:18 ` Johan Hovold
2024-06-04 15:07 ` Pierre-Louis Bossart
2024-06-05 12:11 ` Johan Hovold
2024-06-05 16:15 ` Pierre-Louis Bossart
2024-06-04 7:52 ` [PATCH v2 4/4] soundwire: bus: drop redundant probe debug message Johan Hovold
2024-06-04 8:37 ` Pierre-Louis Bossart
2024-06-04 9:24 ` Johan Hovold
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=20240604075213.20815-3-johan+linaro@kernel.org \
--to=johan+linaro@kernel.org \
--cc=alsa-devel@alsa-project.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=sanyog.r.kale@intel.com \
--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