From nobody Sat Jul 25 02:36:11 2026 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5EA6A21CA0D for ; Mon, 20 Jul 2026 13:33:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784554436; cv=none; b=S1UnTAje4bQeTYqBIT9VEyGXPQF2Slq3td2BTOlULHiOhUJPGhXZM3etZ1apyiQ7W3efB7kCRz+SUu0RV7r/uGcQBV0frN6F2o2vmKcN3riqQH1cD91rJYJaDT+y1I2fhNTfOQjH92sdyzZdLmE2hei1c9MSRW8M63H16DIgE4Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784554436; c=relaxed/simple; bh=ogLsm0dQ9kJr8uvYBH6TofTXqR4/OtZ9XFVY4whvZYE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=gzM6U0YVqMLEgCyXdHbe6Lp1J1b9aWICbPYA8P3O/gBC5+hVDpdtACeVLIXxEJzX9fPua/O0/s0eaUDLlYw0f2kMnw5WJLdO9WjYRjztG9qEntg1iyb04R4qnRlb1LI/YkDwmPO7XT3LuqqaU53PAPKQr4CXrdedSR8Qb/Yd/MQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre.com header.i=@baylibre.com header.b=FcGgPzzS; arc=none smtp.client-ip=209.85.128.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre.com header.i=@baylibre.com header.b="FcGgPzzS" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-4955aa106b1so10984155e9.0 for ; Mon, 20 Jul 2026 06:33:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre.com; s=google; t=1784554431; x=1785159231; darn=vger.kernel.org; h=content-transfer-encoding:content-type:mime-version:message-id:date :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to :content-type; bh=CeDOpukEI38I7/JMCA6E//qeYpYkVI+SwTNXgVxv1XQ=; b=FcGgPzzSCtBsvrW4ryF6snF02YeWjxbYigF2xp42yzLyKzvV6OaZ+9DtBneBYVZ3mn /HVl6IO/zlLs+s4sXI1k0WMOUitx0asSjYMJSRTtyCpDl9RNEFL5Msqut6u0W7ujHLzt RkDC86uaA3JcYW0it4AN0tZd2vvMLdrpzxlWJnzFQTrIb8C1oIUOZ2JDDh3YRcLTlhVV JQiJeY3+NDvk/EixeNX27UpF3Zk9UPHP9uIM8NkhtDiaLU3+q/vTge1WDIgygia8ls9d bP6rcB8L0gVTrPnClztuBmGxohAvtUfc0WKbgo7KdXD0x85Ks5JTz6XkBlam8/pn1QS0 Q/Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784554431; x=1785159231; h=content-transfer-encoding:content-type:mime-version:message-id:date :subject:cc:to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to:content-type; bh=CeDOpukEI38I7/JMCA6E//qeYpYkVI+SwTNXgVxv1XQ=; b=Nj5lAWv2xeOKHpePB4ctmLZT7gKfFLGlcJ+11daa+C1JRUZrTjtpivttgRp29e4uPn 3pBkpWKb/nYqv1mU1d0ngS/oE5Mw3zpvBbhVBMidFHgafE+99dweC4hhOdvLEi145EUy pJXIhwzw1BmtvhDLfhsQaueUl3IQJKuF0DDDYsuSeoNjC6kCjJ5w5nChATCs2uMCsCCX qn7pk/i+LPYxygTCIU8FFa8NpU01lP9iiBJfWMOymb0d/9PwYi/MysJC5UcVxaHH17Ns nNBrdcW7TJRVq/rv3XpP2F0kqtsvgyv6MTWmxlElI0F1RYoyQjpitGghRKaroP3GstL9 M8kw== X-Forwarded-Encrypted: i=1; AHgh+RovPQtecZbm9odAPsj4pLzIKt3lZXcXinmHr5grQUpu6YWjClSMCrChcejYuy5QllW3g8Yer4o/v2Wj7Es=@vger.kernel.org X-Gm-Message-State: AOJu0YwdF/IpJfusLclUHvq/B1qkLYXUTOnhyO6S0G+Tdy1ODrtRwzBx XJR9CAocQ5baFNla/GEgtHVrjgLRxIy5j6k4G+7rSZpY70i7DYCsPhW5K6mQQ29tyKk= X-Gm-Gg: AfdE7cnlqtQ2zHKVw66Txg8+1qsEYM9BXCf1+LoueUouCUFsVtJnph5NO+RfYkmvrco 0FOU+oeu+ZSM6gYUzyVMsB9HZ1OfqWcBOCARYAw2snF0Mk+0yfunHhv9QEqVxAqij5GDK0+4CTE n4Ys8oTQEqH7P5nTrmJqLJSOzH7CJr966jiOhh4KKeWND8TTfUbWOLsW0h3A4gbF7Vs+LJaNryJ zrvfC9YGZus7NHZZlE//blaSdzj210l6xZ262X8yRIPhpY+pmyF8harxExI5U529EJnkJKOv7gH mZzJPd8V6QSgnZ4RgkTP82HzaOnk1OKSWjZMItLylMEXNJmIVvHIAz5i6SqVMb9wGNSGA4/mHzR cXy3il5ADzC3ax3ViHe/56BRTFG5+jEm4bTAFGg4isl4qCCQsvp9896qUP7Wbjf5l/aY4uO8q0a JvJgB6jvBj4QYNb2GzCycyO4cEjMh//Yz5DXVnPt4R+4fGLsMlJbxwVwzERgXJoO6LEQ== X-Received: by 2002:a05:600c:198d:b0:495:5062:17f9 with SMTP id 5b1f17b1804b1-49550622f5cmr110304025e9.30.1784554431485; Mon, 20 Jul 2026 06:33:51 -0700 (PDT) Received: from localhost (p200300f65f47db048587886ecb5b26b2.dip0.t-ipconnect.de. [2003:f6:5f47:db04:8587:886e:cb5b:26b2]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4955370d78csm161360505e9.12.2026.07.20.06.33.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2026 06:33:50 -0700 (PDT) From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20=28The=20Capable=20Hub=29?= To: Srinivas Kandagatla , Bjorn Andersson , Konrad Dybcio Cc: Danilo Krummrich , Geert Uytterhoeven , Dmitry Baryshkov , Takashi Sakamoto , Greg Kroah-Hartman , Dave Hansen , Sohil Mehta , Raag Jadav , Heiner Kallweit , linux-kernel@vger.kernel.org, linux-sound@vger.kernel.org, linux-arm-msm@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH v2] soc: qcom: apr: Drop unused apr_device_id Date: Mon, 20 Jul 2026 15:33:46 +0200 Message-ID: X-Mailer: git-send-email 2.55.0.11.g153666a7d9bb Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Developer-Signature: v=1; a=openpgp-sha256; l=4691; i=u.kleine-koenig@baylibre.com; h=from:subject:message-id; bh=ogLsm0dQ9kJr8uvYBH6TofTXqR4/OtZ9XFVY4whvZYE=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBqXiO69C3f+w/W4aap6VkF3kX9s/z2ohlgutdaG mRVIlS1V9WJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCal4jugAKCRCPgPtYfRL+ TrddB/9unsx9fyLK9AplJlW+Ap8Qi6TTCEVFsTOhTVmlEkDnkZWAtEmOA1GB1m3Ef196oq5sh4v YU5mmgo/Sk4hqIYAV57QAWaXyVqX1O1+f7s4SjfELeHi2L6beiG8cZXvkj85x5wjtHLBBTCCe2x qhZkDwwMax2n2u2aOIIEPWOt1hx+34rtXC6PGX2YBS3uO2G9dG/mka8OMjMGTwsRz0KGflP1V/Z dbDwRONC239zR0h5RI95eKG3iSQPkYLrSiHc+gUEfTx28pBLpZCMkXPoPANk2YHMyFkiSP+q6ev J3m3Rn0XZUOjmDDtrbUp8Y34Xetgr7yVlOYijGuFcpNoDlfD X-Developer-Key: i=u.kleine-koenig@baylibre.com; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: quoted-printable apr_device_id was introduced in commit 6adba21eb434 ("soc: qcom: Add APR bus driver") in 2018, and since then not a single driver made use of it. So drop the unused id_table pointer from struct apr_driver and move APR_NAME_SIZE to the apr header which still has a usage of it. Note that with the id_table being NULL apr_device_match() degrades to just of_driver_match_device(), so replace this callback accordingly. Reviewed-by: Srinivas Kandagatla Reviewed-by: Dmitry Baryshkov Signed-off-by: Uwe Kleine-K=C3=B6nig (The Capable Hub) --- Hello, v1 is available at https://lore.kernel.org/all/dee008af1510ee2a71087f3798814dd516730413.178151= 7268.git.ukleinek@kernel.org =2E This is a rebase to current next which didn't rebase cleanly due to commit ad428f5811bd ("mod_devicetable.h: Split into per subsystem headers") that made it into v7.2-rc2. I kept the Reviewed-by tags anyhow because the conflict was easy. (Not trivial enough for git to automatically do it, though.) Best regards Uwe drivers/soc/qcom/apr.c | 25 +------------------------ include/linux/device-id/apr.h | 21 --------------------- include/linux/mod_devicetable.h | 1 - include/linux/soc/qcom/apr.h | 4 ++-- 4 files changed, 3 insertions(+), 48 deletions(-) delete mode 100644 include/linux/device-id/apr.h diff --git a/drivers/soc/qcom/apr.c b/drivers/soc/qcom/apr.c index ea7f83916d8d..2073edb416a4 100644 --- a/drivers/soc/qcom/apr.c +++ b/drivers/soc/qcom/apr.c @@ -338,29 +338,6 @@ static void apr_rxwq(struct work_struct *work) } } =20 -static int apr_device_match(struct device *dev, const struct device_driver= *drv) -{ - struct apr_device *adev =3D to_apr_device(dev); - const struct apr_driver *adrv =3D to_apr_driver(drv); - const struct apr_device_id *id =3D adrv->id_table; - - /* Attempt an OF style match first */ - if (of_driver_match_device(dev, drv)) - return 1; - - if (!id) - return 0; - - while (id->domain_id !=3D 0 || id->svc_id !=3D 0) { - if (id->domain_id =3D=3D adev->domain_id && - id->svc_id =3D=3D adev->svc.id) - return 1; - id++; - } - - return 0; -} - static int apr_device_probe(struct device *dev) { struct apr_device *adev =3D to_apr_device(dev); @@ -401,7 +378,7 @@ static int apr_uevent(const struct device *dev, struct = kobj_uevent_env *env) =20 const struct bus_type aprbus =3D { .name =3D "aprbus", - .match =3D apr_device_match, + .match =3D of_driver_match_device, .probe =3D apr_device_probe, .uevent =3D apr_uevent, .remove =3D apr_device_remove, diff --git a/include/linux/device-id/apr.h b/include/linux/device-id/apr.h deleted file mode 100644 index f282608ea018..000000000000 --- a/include/linux/device-id/apr.h +++ /dev/null @@ -1,21 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef LINUX_DEVICE_ID_APR_H -#define LINUX_DEVICE_ID_APR_H - -#ifdef __KERNEL__ -#include -typedef unsigned long kernel_ulong_t; -#endif - -#define APR_NAME_SIZE 32 -#define APR_MODULE_PREFIX "apr:" - -struct apr_device_id { - char name[APR_NAME_SIZE]; - __u32 domain_id; - __u32 svc_id; - __u32 svc_version; - kernel_ulong_t driver_data; /* Data private to the driver */ -}; - -#endif /* ifndef LINUX_DEVICE_ID_APR_H */ diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetabl= e.h index a397213bedac..4fe1cd64292f 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h @@ -15,7 +15,6 @@ #include "device-id/acpi.h" #include "device-id/amba.h" #include "device-id/ap.h" -#include "device-id/apr.h" #include "device-id/auxiliary.h" #include "device-id/bcma.h" #include "device-id/ccw.h" diff --git a/include/linux/soc/qcom/apr.h b/include/linux/soc/qcom/apr.h index 909e84f84e0c..2e4231092088 100644 --- a/include/linux/soc/qcom/apr.h +++ b/include/linux/soc/qcom/apr.h @@ -5,7 +5,6 @@ =20 #include #include -#include #include #include =20 @@ -135,6 +134,8 @@ struct pkt_router_svc { =20 typedef struct pkt_router_svc gpr_port_t; =20 +#define APR_NAME_SIZE 32 + struct apr_device { struct device dev; uint16_t svc_id; @@ -158,7 +159,6 @@ struct apr_driver { const struct apr_resp_pkt *d); gpr_port_cb gpr_callback; struct device_driver driver; - const struct apr_device_id *id_table; }; =20 typedef struct apr_driver gpr_driver_t; base-commit: 0718283ab28bc3907e10b61a6b4be6fefa1cbb2f --=20 2.55.0.11.g153666a7d9bb