From nobody Wed Dec 17 08:50:33 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D76815B13D for ; Fri, 12 Jul 2024 14:08:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720793319; cv=none; b=aBBtLZQT1anih2r+B+ljQN6dj3cAymYYwPDMRDGujL4vTTJywMIfOIacRTWzdWrBBsy54Fi1J0fpsFGzFZVVaWPueGPSRJ5qGnWCjYy9MyhEAQOfd9rGHN4f0pBl4htIJhq3XzZARZE140gVpv7/VYdLXRohMwIt57YXbq1uvXk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720793319; c=relaxed/simple; bh=1tdVOay90qKoOBtZsqzjMTRYxUTqdTqLiJ2eTqVl8pQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rzdOY4jUGogkw689Nn4c6lhRJDVVULX2awnMUsA07e49ErvTnZvBEWCB4H7Ln9Kt9kLYwNGoAhKO9wOMBhIKl3akQYZ+MN8FNbO07H1bc8NhanA0kQV2oLplYMFKAB3IJgBpwY3oyfMgJM71XJAby36tOKlTMdMUVGByO34jyEs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GK3m/Myd; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="GK3m/Myd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D1950C32786; Fri, 12 Jul 2024 14:08:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1720793318; bh=1tdVOay90qKoOBtZsqzjMTRYxUTqdTqLiJ2eTqVl8pQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GK3m/MydnKsOO1mz/qpTsUU9Nr0bk06clrR4al/JiC6cqzmPsBG5Hg/HbrJB6V5p/ VfO1OeNQUzdM+OAukBXhVBcVRSp5SB+3n5uLIFzmDi3kBmFiZEqg9NVVvYSbC5VVoc eoyXCcg3bLYTzGi26SRde1JghliDd10PABRONJVZC2NJ9XUN2ijKT90rpaFnI7/sK5 jtgGc+IwwfRZqgutxUkGBICwFtSEUcLruWvBq6auro1SmcJ7J3HlBcVUK+8MKfgMhb /dMLabtmPad37/NGQduHsN/yIc9xDE/Cr8JDp731IT3AI/lwsZXg+aPNrmSpKGjpV1 36B76Ub7UWTQg== Received: from johan by xi.lan with local (Exim 4.97.1) (envelope-from ) id 1sSGww-000000006KD-1grC; Fri, 12 Jul 2024 16:08:38 +0200 From: Johan Hovold To: Vinod Koul , Bard Liao Cc: Pierre-Louis Bossart , Sanyog Kale , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH v3 1/3] soundwire: bus: suppress probe deferral errors Date: Fri, 12 Jul 2024 16:07:59 +0200 Message-ID: <20240712140801.24267-2-johan+linaro@kernel.org> X-Mailer: git-send-email 2.44.2 In-Reply-To: <20240712140801.24267-1-johan+linaro@kernel.org> References: <20240712140801.24267-1-johan+linaro@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Soundwire driver probe errors are currently being logged both by the bus code and driver core: wsa884x-codec sdw:4:0:0217:0204:00:0: Probe of wsa884x-codec failed: -12 wsa884x-codec sdw:4:0:0217:0204:00:0: probe with driver wsa884x-codec fail= ed with error -12 Drop the redundant bus error message, which is also incorrectly being logged on probe deferral: wsa884x-codec sdw:4:0:0217:0204:00:0: Probe of wsa884x-codec failed: -517 Note that no soundwire driver uses the driver struct name field, which will be removed by a follow-on change. Signed-off-by: Johan Hovold Reviewed-by: Pierre-Louis Bossart --- drivers/soundwire/bus_type.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/soundwire/bus_type.c b/drivers/soundwire/bus_type.c index c32faace618f..85fa5970d98a 100644 --- a/drivers/soundwire/bus_type.c +++ b/drivers/soundwire/bus_type.c @@ -83,7 +83,6 @@ static int sdw_drv_probe(struct device *dev) struct sdw_slave *slave =3D dev_to_sdw_dev(dev); struct sdw_driver *drv =3D drv_to_sdw_driver(dev->driver); const struct sdw_device_id *id; - const char *name; int ret; =20 /* @@ -108,11 +107,6 @@ static int sdw_drv_probe(struct device *dev) =20 ret =3D drv->probe(slave, id); if (ret) { - name =3D drv->name; - if (!name) - name =3D drv->driver.name; - - dev_err(dev, "Probe of %s failed: %d\n", name, ret); dev_pm_domain_detach(dev, false); return ret; } --=20 2.44.2 From nobody Wed Dec 17 08:50:33 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D80D171075 for ; Fri, 12 Jul 2024 14:08:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720793319; cv=none; b=qVjSjSmiMqdb+sKPOu35RJBK1Bte9or/P8Q7OQTbDvrp8cXZRFW1QSd1rMe7LQjYp0FUyt0km9LFBk0FlaDHh6O+oMVYOpHBv6h/NfqjBMunri+m0m/6bhojRQw15E8vCMz3vIA7Oy/fqx+N8ZyRs+EqQKUBhUBUcxwLbUyNZTE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720793319; c=relaxed/simple; bh=b+g0wkurwgHAuPLw7DhPBo/ti/dMGUAaoXVnZGKEE8I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MkxVCzpgcTgMaibKj5ihZNqw9rdgDGKem0CfUwDqe+/jRVpTifcHRo2DOTYDLd3Dl+UknZ+f/cO+l7Wo6h1aGYseU96NuxseX/sbriqZmidTRpQ7EcTqR87fPiBgd/c2jSjBlBreH/6jcPrOyGoOfuGhj/JFkNrE5AGDLYNOAmE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BDHcw8kb; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="BDHcw8kb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D1904C32782; Fri, 12 Jul 2024 14:08:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1720793318; bh=b+g0wkurwgHAuPLw7DhPBo/ti/dMGUAaoXVnZGKEE8I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BDHcw8kbCQHMIjLRnqnjXcU7HVZ0TKlGr5Bi7s5XAO8/IOO+lLNTfrv6X3MjU9pHg q3Zgj0sP590L1hPn6uo9KzHt9vE2ToiAiM/s4a+KlCF78+kx2kCw0+iM52A48JdEdI VcnJkmcCg20taxvNyzfdSwoXe0J37rN9My2cR5ENAIB3LFNL12zwQslIvEulpTf7I5 0BuC0NupQoW9Lt9SCqqlPiGPEOyqYn4qer7U1sZmcHKs/N9+gLENLfJTkY82mw0hz2 ATeNoA7WtgmOPnmhj75ijOEERE9e8X34vjy1/yaCpBJxa5bt9og8EPV6jdq7/1tCS0 bbCOaS55eu75Q== Received: from johan by xi.lan with local (Exim 4.97.1) (envelope-from ) id 1sSGww-000000006KF-244e; Fri, 12 Jul 2024 16:08:38 +0200 From: Johan Hovold To: Vinod Koul , Bard Liao Cc: Pierre-Louis Bossart , Sanyog Kale , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH v3 2/3] soundwire: bus: drop unused driver name field Date: Fri, 12 Jul 2024 16:08:00 +0200 Message-ID: <20240712140801.24267-3-johan+linaro@kernel.org> X-Mailer: git-send-email 2.44.2 In-Reply-To: <20240712140801.24267-1-johan+linaro@kernel.org> References: <20240712140801.24267-1-johan+linaro@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Pierre-Louis Bossart --- 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 =3D &sdw_bus_type; =20 if (!drv->probe) { - name =3D drv->name; - if (!name) - name =3D 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; } =20 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) =20 struct sdw_driver { - const char *name; - int (*probe)(struct sdw_slave *sdw, const struct sdw_device_id *id); int (*remove)(struct sdw_slave *sdw); --=20 2.44.2 From nobody Wed Dec 17 08:50:33 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D7CC16F856 for ; Fri, 12 Jul 2024 14:08:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720793319; cv=none; b=DsEib82UgZhet42B/SHdR9jQnis/pFGi7/JS74BYRi+SoPYKHDdpW06bm952VWHf+VLOHHcarrQJGEonMI4Utv5U5g0Zxv2NwFFiInZ+/8q9oT1sPzRLmX6i2LOL8//aQl0bjGKWxakWd6qSuN2OzwcRDNvG2NHHCD+cU5E5Hsc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720793319; c=relaxed/simple; bh=d6yyoRJi3R7yLXIYWh6FukyOXX8Ng8iIFRGZyBMCrXo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tvuVTUmKJptpuDM8q6rJ7eHurxHLIj+t6z4f7rCTFC94NVXJFn+HbhhfOD5hYfZtoevlAgj8AKYJN6WIXEsGgoAxbrn4BaLgdGD8TpZksJLpPmC6jnM8J6SPqyea0YiJIa1G5yo7bIZvk61kVsJgieQSGfY7iglYRLJ/Mcw/i7c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HnDTtrTV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="HnDTtrTV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D7F70C4AF0C; Fri, 12 Jul 2024 14:08:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1720793318; bh=d6yyoRJi3R7yLXIYWh6FukyOXX8Ng8iIFRGZyBMCrXo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HnDTtrTVCPk95Zr6JsIUWD3Cm2jUSrQTDVV7VSJSR+G6Y0J8PExnHlOhBGExpz+TP acrxF8PmDPQ52yA50xcbEEKzYOtvaTtPuxPQM7d2f/4F19BoFpyUD4L8LWdNNJIYIH 0lIzNGb3PWHO8cVAm3isOou6Wo+1lvYkXgruQD/KWyM1u3Ei+aRLpix5yFv67564Ox 4913kyPvgObMRIriJfAML5rGzl+Vsjw5FJK7dLWi4olahVkKd6/rh8ZVRydVO3XbWz BOfg1yvGjaXlmfxlx7SOzSkhoZflX0kKXyIhkQ1tLBDfF9eGps/QPB0hTtK34JjXa+ BnnkmwjwvBJeA== Received: from johan by xi.lan with local (Exim 4.97.1) (envelope-from ) id 1sSGww-000000006KH-2R4B; Fri, 12 Jul 2024 16:08:38 +0200 From: Johan Hovold To: Vinod Koul , Bard Liao Cc: Pierre-Louis Bossart , Sanyog Kale , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH v3 3/3] soundwire: bus: clean up probe warnings Date: Fri, 12 Jul 2024 16:08:01 +0200 Message-ID: <20240712140801.24267-4-johan+linaro@kernel.org> X-Mailer: git-send-email 2.44.2 In-Reply-To: <20240712140801.24267-1-johan+linaro@kernel.org> References: <20240712140801.24267-1-johan+linaro@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Clean up the probe warning messages by using a common succinct and greppable format (e.g. without __func__ and with a space after ':'). Signed-off-by: Johan Hovold --- drivers/soundwire/bus_type.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/soundwire/bus_type.c b/drivers/soundwire/bus_type.c index 3979be0f8b65..3930b245008d 100644 --- a/drivers/soundwire/bus_type.c +++ b/drivers/soundwire/bus_type.c @@ -123,7 +123,7 @@ static int sdw_drv_probe(struct device *dev) /* init the dynamic sysfs attributes we need */ ret =3D sdw_slave_sysfs_dpn_init(slave); if (ret < 0) - dev_warn(dev, "Slave sysfs init failed:%d\n", ret); + dev_warn(dev, "failed to initialise sysfs: %d\n", ret); =20 /* * Check for valid clk_stop_timeout, use DisCo worst case value of @@ -147,7 +147,7 @@ static int sdw_drv_probe(struct device *dev) if (drv->ops && drv->ops->update_status) { ret =3D drv->ops->update_status(slave, slave->status); if (ret < 0) - dev_warn(dev, "%s: update_status failed with status %d\n", __func__, re= t); + dev_warn(dev, "failed to update status at probe: %d\n", ret); } =20 mutex_unlock(&slave->sdw_dev_lock); --=20 2.44.2