From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (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 E95CB3D332E for ; Mon, 15 Jun 2026 10:04:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781517882; cv=none; b=Udrd+nb77HDy0AdegEJfGA2qLBuLxV/3rS5eFKEwjs/aoJMiFuu0mVGaGlPW88EMuxgWqlUdbiWPJQcN6MsPUKinnnmbsb/AgK7q0blq3Hc0RZsAWDPGklfyQUZzmNXkuuc3IJlUI1ogNalCoy0HfbMWAmueGCaMK636/dGbm8I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781517882; c=relaxed/simple; bh=HWOy5qI3cE3XDG2aY78lPGc4t10sB3g/XAplVhrp81o=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=GDD/7dqIUCK5I2VC12u3qhHJipoDgnksJqL6P+1OJ0m+weBvhXXa2ZX+eNea8Q/xVPr7uAJD+HU30AiNxaD69uZPLqdbyHs576a4aimOayNXEMS++uYGPFNKXGktWbl+tW7v0HnPwrOSyBGOX4y7zDytQiMXSCBIBBYPOnD89EA= 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=LRDJctQh; arc=none smtp.client-ip=209.85.221.48 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="LRDJctQh" Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-45eecb8bf67so2587295f8f.2 for ; Mon, 15 Jun 2026 03:04:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre.com; s=google; t=1781517878; x=1782122678; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=chId6eLdk67OpLiEbLar+llIOLem48s5WXHEBw8NInU=; b=LRDJctQhfTbqS6YbYE0rs+xwqmeAOUUcDEogaezoXdUH9gXzSA3gGEmXVEiT9CHmeH LPGwZyTe0WZPgBNbyLTH4S5Hz5cv2ehhOovpYK3WcccnO9Wt6uzbE7Alhpr8W3PhVzRR s59vSCHuppmSoVRYVYLeBF8z9aZF6IMSsV0Mh01m3LVJXdGEz9eCIUu4lQlYYqFCyETG 0gEYOBjzBZXfPZI54bn6per6xiJWKWcM3IlKw01voJAdZVwGuHCBHK0om8c39Ork6I1T NqmPb9kQ0oDSSYKfmf5SL+c5q444Db7TyQh0N+IQlz+vVWr/UQcdJjR+Fq90PiCqZfzz enGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781517878; x=1782122678; h=content-transfer-encoding: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; bh=chId6eLdk67OpLiEbLar+llIOLem48s5WXHEBw8NInU=; b=JK6sIfzcwvsgcXluAV30yjrDPHzbKsnlkLxuYH7g+sHo5p8umEGRfHenH2TwSx7eic P19GujU+GAkB1QtGYw2FpzIOaZDYDaZCMHeHQqV7P6nIP6LBNP2+ef+XHeHIo70q6UBa kn3jurnCN1jW8rXtRqvTJ1Hd1qiDtgbPTq1nmi4BA6ahO/SZkp4tqxfBMS3ykAx0K29V t8cbDKf7CK4irIQHn20t/7m3Qpq664zTewznvnywgUpUTSbeHWuDZ8/nCgMe7NEylXze c7HGXK2/V5fTviLuIi6REQUvEzNR35qZ6V8yXS6Aq8mB+bMjRrjEwCXgmRviT6ZL7Gl+ rzKQ== X-Forwarded-Encrypted: i=1; AFNElJ/eH6i3xl9FtOVjra7r4NglR4DLCZ2LDvYgKR29E7k+ERTQ2hhr650e/WnLrnU4MoAHnyEnithDGYIpBSk=@vger.kernel.org X-Gm-Message-State: AOJu0YwXg9JnKZ0tii/MNpi6n2uEZ/sm0byWe7DKANLzllURh2+UJ5ID bq6pBPoCpXHs+2lS3uA6TXeJzuSyikx5W4Lw8G/VgDbV9N1aaNFqNfK53oH87Engghc= X-Gm-Gg: Acq92OG816ym11S8HJVQRJrnw7kEu0XaMF6vAsnJy0yuvzsjqFV4Qhpf5IgldsAR477 VmnnYBgrVT8Fi5myzkG+83aniUVYFogZjB1ph2xDH5Nw4PTLKdNumyEk2o8LUc/cI4FY/p6bJoD Ft1alN1UL5rRGHcVpks4ofO4ZMvXlCMogA16MS89EG2MUZu7tsHwNHNh3gJzbsOcFi7n9F0pDZX AKVAwOWwnYwN9+TTadB8d4jGf+0L9uchlvkdHv/qGx/1nYO3h1OzbtDm/yOiRhQjAyO+EIbIuTQ D+1vWBgspiQi8LFfxdcKabYdiHbeBSIxNrPTqNMlD5qmpx3NqH+iaUSRE7lnq3PYVhfdW52j845 PzDDvgwlCph0yswCklMrb0ZeEqGsCPNH3pyIZzo5OF7ePvCOKlozv8cmUvU70i94G4GdjCQegp8 3sRCTzp57W+kxetLroTt63rNa2pbq3dWk7f4So/LOPjxOl0VXoL8c2W8lgySNZn3uaDcZdLbVj8 RaKrsg4BaVsPGQ= X-Received: by 2002:a05:600c:3145:b0:490:be44:32ea with SMTP id 5b1f17b1804b1-490ec4a16b9mr207550085e9.7.1781517878214; Mon, 15 Jun 2026 03:04:38 -0700 (PDT) Received: from localhost (p200300f65f47db04b1d4be4b87a025dc.dip0.t-ipconnect.de. [2003:f6:5f47:db04:b1d4:be4b:87a0:25dc]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-490ea94f5b0sm231746795e9.1.2026.06.15.03.04.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2026 03:04:37 -0700 (PDT) From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20=28The=20Capable=20Hub=29?= To: Srinivas Kandagatla , Bjorn Andersson , Konrad Dybcio Cc: Takashi Sakamoto , Dave Hansen , Sohil Mehta , Raag Jadav , Heiner Kallweit , linux-sound@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1] soc: qcom: apr: Drop unused apr_device_id Date: Mon, 15 Jun 2026 12:04:28 +0200 Message-ID: X-Mailer: git-send-email 2.47.3 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=3433; i=u.kleine-koenig@baylibre.com; h=from:subject:message-id; bh=HWOy5qI3cE3XDG2aY78lPGc4t10sB3g/XAplVhrp81o=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBqL84tUuQ9DV3X0CAvNauDcPbASZ2NR58j4lJBR RzH4qa/Wl6JATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCai/OLQAKCRCPgPtYfRL+ Tg8+CACmUm8o+aY9qCJjyOBmQb/ne/FIsv8OweqcwNMbpnO+dom4nyzGjnLH5SjzZxI0aQxEzjx DhqKPOehlLmEpJARER8x3RuMAWBmc1X9W+DQs78eDWLiNfaMJUOSnZgZ3XRCX3YF4LVBP3aoV9p wwJJP8R/vpsODOtaozb1rNn9G+SZ3HOk+64CNnR6Q/UfF+1RBsCSFNF/6VjzyJc5s4XhQKw45V+ xFZ5Gfz4T0DMslNP56GIKn9DW61rnxMFLvTooCIAhh4nLEL0azFKUUx1X34w88u4Yca2T6sLwWI bwK14ok7OPv/STlq66/9Xjf/ghCujagUtvo8rpXSzpqPApeI X-Developer-Key: i=u.kleine-koenig@baylibre.com; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: 8bit 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. Signed-off-by: Uwe Kleine-König (The Capable Hub) --- drivers/soc/qcom/apr.c | 25 +------------------------ include/linux/mod_devicetable.h | 11 ----------- include/linux/soc/qcom/apr.h | 4 ++-- 3 files changed, 3 insertions(+), 37 deletions(-) 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) } } -static int apr_device_match(struct device *dev, const struct device_driver *drv) -{ - struct apr_device *adev = to_apr_device(dev); - const struct apr_driver *adrv = to_apr_driver(drv); - const struct apr_device_id *id = 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 != 0 || id->svc_id != 0) { - if (id->domain_id == adev->domain_id && - id->svc_id == adev->svc.id) - return 1; - id++; - } - - return 0; -} - static int apr_device_probe(struct device *dev) { struct apr_device *adev = to_apr_device(dev); @@ -401,7 +378,7 @@ static int apr_uevent(const struct device *dev, struct kobj_uevent_env *env) const struct bus_type aprbus = { .name = "aprbus", - .match = apr_device_match, + .match = of_driver_match_device, .probe = apr_device_probe, .uevent = apr_uevent, .remove = apr_device_remove, diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index 7f44057aa65e..d74ff3ee1424 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h @@ -547,17 +547,6 @@ struct slim_device_id { kernel_ulong_t driver_data; }; -#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 */ -}; - #define SPMI_NAME_SIZE 32 #define SPMI_MODULE_PREFIX "spmi:" diff --git a/include/linux/soc/qcom/apr.h b/include/linux/soc/qcom/apr.h index 58fa1df96347..2e4231092088 100644 --- a/include/linux/soc/qcom/apr.h +++ b/include/linux/soc/qcom/apr.h @@ -5,7 +5,6 @@ #include #include -#include #include #include @@ -135,6 +134,8 @@ struct pkt_router_svc { typedef struct pkt_router_svc gpr_port_t; +#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; }; typedef struct apr_driver gpr_driver_t; base-commit: c425609d6ac4012c8bbf01ec2e10e801b1923a7b -- 2.47.3