From nobody Tue Apr 7 02:40:30 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (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 1E2C43B5821 for ; Mon, 16 Mar 2026 17:14:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773681284; cv=none; b=s5CFLeCO2DYWOXXt54PdVaN1Djc7/GcS01fmdR8Al+LrZS4cf2UDpbTEFzJnDB72K/cq2g0NqeIGt+I9UvKqVv3MBghun0mLem07zjjGO6I8ITmShHaIE72zx+ggJEdGxXPrpGNIKbhKhxnZnFwdIfggsHPEXRprL0qj4uTTMyI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773681284; c=relaxed/simple; bh=vBQ6tTOdMa9PYbW5txamAlvd10vFcBIuxy+lZseqTwI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QDaUTOEkIyyZn5fuLhM/VsUvbt3QqdX8kFVuEIgKwLldrW+l2XW7zrt94FP/KjsjroFYNCUxQIMsa15WTijVnItpGUSrCxqkXgoW8/HTdx6FSU+knl9Txc5c8R9gG+rGit1SpHLXdvCBQrpJap3Nez9DDqNT94x7ubtRsJ02p4g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=DVsSgDcA; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Tqc+ZEQ3; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="DVsSgDcA"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Tqc+ZEQ3" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62GF2jsv1534110 for ; Mon, 16 Mar 2026 17:14:42 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=JbLYlc4Rhba fmIWJaPEz85qHfWanHtwL6D/B5T51hlU=; b=DVsSgDcAKCTmEeR7blNUSxx/K50 JpPXUhCOYXuK+aOwWkb5J5g+nEO9VT5fBX+8A+kFJiHfFYkae5jwOYz5xd2CDh+W zWzlQF6DjO9E+VAB5xGOEffGRrA7NKQsskBhnMhFhHMWdfJuESNFY4Awjhn5BLE5 Z4zTDfL76Z1zQIRWnvwqMMGyxsEC2N7hYOU/0dATVMbpUIp+jxJiDr9Hd4uYKEmz GM1CtzSl9SJFqEuMBjmcv/KQhuJd/ANnR1xDVCrhJZPGDbk/16T3S+JSiMEYhnpN l84P19B96VJeN03VrJOLe+/Mz7nd3Yh2LwAN5/yGySj9hWp5vN0XahRUwNA== Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cxm5k0gxc-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 16 Mar 2026 17:14:40 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-8cd83cfb36cso1453658885a.3 for ; Mon, 16 Mar 2026 10:14:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773681279; x=1774286079; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JbLYlc4RhbafmIWJaPEz85qHfWanHtwL6D/B5T51hlU=; b=Tqc+ZEQ3rQAsq7INcZgy4dRMj+kNIz7SXyiNFB7XNJ9GUW/ZwAMx4BXKnqwEFOcp2E GVKJULSm52un06sagmJFVDN8mQ0zoVXIbu482BDVRTAi/kXviRpBN73nLEAahXsIzz0c vSSqsL60eAXuPQpi2Y20lgVQsgvW+2y5mCR4tftz74U9d9dXavM/k+YZYMcANlX+Ed9V 5AiNqKCnpm2mtXsoz/GfEMLIYdFl03Fc0OP8L1Mu5wGV4qhXTXzFh3pvcgrZqLhjWLox wVf8OUWUH9BI5RPeijct+133rn4KfKZb3ntUnQvP7kfDqkLaLBCk92/p5aneYsJkEMPI hHlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773681279; x=1774286079; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=JbLYlc4RhbafmIWJaPEz85qHfWanHtwL6D/B5T51hlU=; b=F0xobK07snrIQRCFDPDufg9UU77tXGg5HyJBSYQ8pvKEFdysiwOBdcpk8lG2KSH6sj P8vjEIu0qMlAA7kMIMEZi2KcTYhbdAqz6ONzCrPYajBvIaTulZ5LMMXPVNe99+gn8Myh CtQq21HrpAEmrPEHgi1VYSpr8blo47gRQFKlhMSxUX4TnX4Kf8Ud/9x1F/Fo6rGnAHrl E5qCjj67zRHj5N9s5ZXFADKak4bn/V7H/j0GlhGosLLJyrtMgddiXaCCrp9WI9M6KNv2 kn2vVf1uw2ee3Y8lS2PQFGXmyCo9Z2h3S9ypi0Z9y9BGk6ahgD+ay0VDj2yWWBgGH64Y KdOQ== X-Gm-Message-State: AOJu0YwrmJSgx8zqco2R18gLVOsq1MpubSwZqQwXEL9Rj4/jE6K+2iDJ N/j77MFu7N03lryrhAFOO8vzp30o51MjDPJxNmOTPYZ1Le2BIarN81+Qmhr/M0LnodwYrFBmkiE 2PUD0xYI8G8Tf16e4K1vRRmuczpdzyCdCPm+Uiyg3cMxTm1+OxlwBksGylXZqw9c/jds= X-Gm-Gg: ATEYQzxYsNz7RmQB4kGVj4B2nUgXCREY5LzdJhlquYzjkZIragydzUq5XHC2JurWFE6 5HrBXsQ5t5CckW4Cef52RzxdUt8tOWJJAeQgvnjxo3RGw/SStjDb6neT1+t4aIAH7NGCb6X77XK VPWjwJP7E+McdcvpckbTSiC5hU0W7CTEtmCCrjpJrv5Ot1AX3RNjOIO8Y+1sEndc7Ib/Vl/Lk9j mN+59JCIL1nXk4x2U9iPjPKZ83qVxKieD6CWbnpCJQf55yP4hwGrWuCdaPo3hrCRw7LYr6qb/Kw J6fsqvyFYZdYPxxRmbWtccqGR7UA/eXLspFwCgLr3ujDLYYKSa4NAn2Ma8mx86uKaOd/TqVepvG mh3+TpQz6SUkO+7TALDwKLfLs1LN86NXnQu9ZN5WtaJzR23lKYQ== X-Received: by 2002:a05:620a:470c:b0:8cd:b2cd:10a2 with SMTP id af79cd13be357-8cdb5b4d4ebmr1859176385a.49.1773681279586; Mon, 16 Mar 2026 10:14:39 -0700 (PDT) X-Received: by 2002:a05:620a:470c:b0:8cd:b2cd:10a2 with SMTP id af79cd13be357-8cdb5b4d4ebmr1859171685a.49.1773681279092; Mon, 16 Mar 2026 10:14:39 -0700 (PDT) Received: from mai.box.freepro.com ([2a05:6e02:1041:c10:5dfc:3995:22ce:d286]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439fe20b544sm43860993f8f.20.2026.03.16.10.14.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2026 10:14:38 -0700 (PDT) From: Daniel Lezcano To: konradybcio@kernel.org, andersson@kernel.org Cc: linux-kernel@vger.kernel.org, Alex Elder , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jeff Johnson , Mathieu Poirier , Srinivas Kandagatla , Jaroslav Kysela , Takashi Iwai , Kees Cook , Greg Kroah-Hartman , Arnd Bergmann , Mark Brown , Wesley Cheng , netdev@vger.kernel.org, linux-wireless@vger.kernel.org, ath10k@lists.infradead.org, ath11k@lists.infradead.org, ath12k@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-sound@vger.kernel.org, Dmitry Baryshkov Subject: [PATCH v2 1/4] net: ipa: Use the unified QMI service ID instead of defining it locally Date: Mon, 16 Mar 2026 18:14:11 +0100 Message-ID: <20260316171419.2619620-2-daniel.lezcano@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260316171419.2619620-1-daniel.lezcano@oss.qualcomm.com> References: <20260316171419.2619620-1-daniel.lezcano@oss.qualcomm.com> 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 X-Authority-Analysis: v=2.4 cv=fJ00HJae c=1 sm=1 tr=0 ts=69b83a81 cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=xqWC_Br6kY4A:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=shTvKy1OFHrmHVGPjj8A:9 a=IoWCM6iH3mJn3m4BftBB:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzE2MDEzMyBTYWx0ZWRfX9u1XUgD4pLe+ 6HLcEKEUwo1+RbekRbcbnqI8mzfHW3nFeciaSI3dj7tc+84G/rZkjJ/WII1oFTaFi+iuyyRLpis y/luZg/bW2HmaJRjlKzP8u3CSBEFZiEaRMa9ooBHUeJGx9ErcBtyRR/pEVfaZ8rur/ntH7idnux AC9Si+wF1ScjjO1mnWU8/93VbAMbyx9mKF9vC9qs5SCjZyKZKon3DykAwDK//5uAqx5dAF8L0jR xA0cCvcL6Jjx9LWFeSj5XGXN8mk/1X9yzC/RbpBShC/Z0aVULluS+H2LFUby0XsiqL48IgiBh38 LzM99Xhk7sUbZ7NQU8rvH2gQ2ZDAw2WYtjYOu/7f+Z1T0gy/y7W4qXhHlOfRC7HzeJvq23eV+xZ 1NmnM2mWA1oh7abScGwtmm1F0QaNdOIbePiSkaDxBr+ALPeYoZRpPc5sPK54dt9M5sQlwvIkufk sHaBBw3GOgP9c7wZdYw== X-Proofpoint-GUID: CMz8mbfvBjuy_5Tf13HZiwfs0b2hU2BV X-Proofpoint-ORIG-GUID: CMz8mbfvBjuy_5Tf13HZiwfs0b2hU2BV X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-16_04,2026-03-16_04,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 clxscore=1015 malwarescore=0 suspectscore=0 phishscore=0 lowpriorityscore=0 priorityscore=1501 impostorscore=0 adultscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603160133 Content-Type: text/plain; charset="utf-8" Instead of defining a local macro with a custom name for the QMI service identifier, use the one provided in qmi.h and remove the locally defined macro. Reviewed-by: Dmitry Baryshkov Signed-off-by: Daniel Lezcano --- drivers/net/ipa/ipa_qmi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/ipa/ipa_qmi.c b/drivers/net/ipa/ipa_qmi.c index d771f3a71f94..37936ad132a2 100644 --- a/drivers/net/ipa/ipa_qmi.c +++ b/drivers/net/ipa/ipa_qmi.c @@ -66,11 +66,9 @@ * determination of when things are "ready" */ =20 -#define IPA_HOST_SERVICE_SVC_ID 0x31 #define IPA_HOST_SVC_VERS 1 #define IPA_HOST_SERVICE_INS_ID 1 =20 -#define IPA_MODEM_SERVICE_SVC_ID 0x31 #define IPA_MODEM_SERVICE_INS_ID 2 #define IPA_MODEM_SVC_VERS 1 =20 @@ -484,7 +482,7 @@ int ipa_qmi_setup(struct ipa *ipa) if (ret) return ret; =20 - ret =3D qmi_add_server(&ipa_qmi->server_handle, IPA_HOST_SERVICE_SVC_ID, + ret =3D qmi_add_server(&ipa_qmi->server_handle, QMI_SERVICE_ID_IPA, IPA_HOST_SVC_VERS, IPA_HOST_SERVICE_INS_ID); if (ret) goto err_server_handle_release; @@ -501,7 +499,7 @@ int ipa_qmi_setup(struct ipa *ipa) /* We need this ready before the service lookup is added */ INIT_WORK(&ipa_qmi->init_driver_work, ipa_client_init_driver_work); =20 - ret =3D qmi_add_lookup(&ipa_qmi->client_handle, IPA_MODEM_SERVICE_SVC_ID, + ret =3D qmi_add_lookup(&ipa_qmi->client_handle, QMI_SERVICE_ID_IPA, IPA_MODEM_SVC_VERS, IPA_MODEM_SERVICE_INS_ID); if (ret) goto err_client_handle_release; --=20 2.43.0 From nobody Tue Apr 7 02:40:30 2026 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (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 58C073D0937 for ; Mon, 16 Mar 2026 17:14:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773681285; cv=none; b=a58sJGSHfO/PQoAE0w8kk5ekY0FWTk97kgBMw8fK8j1UhBks3ThEhhZNJksniV42lXAiLUu0kg7pUixcUB0kfdSea/So5lKuuLk4844KE2WH5Kzso6o8puNwe+jgv2lcJJ3QtG7wVt+ART+jvkQY4gX47hy6U2WJD1flL4VmBu4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773681285; c=relaxed/simple; bh=RitF4X0ydyAtTX/CCYADqtg2SWdZZo+quUkjHBSz16s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hGZdDq8pqabU1B926WpSWqEhjwQq4Q987Ual1cpWaIPfi02RB3P2Pp9Ct13df3/PFmOYWqOlkavaMtyghmhUgfd2I2ktHl602piSEBZ4ra2ynqUh02BnSM+Eg9SWdXHt90UO0CYtBzrLCDffeF+JX7mA5BJ1PINgvH0QV39M2/w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=fJ6kkfYD; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=csOpmZAg; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="fJ6kkfYD"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="csOpmZAg" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62GGRMDr3124561 for ; Mon, 16 Mar 2026 17:14:42 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=sttkd7eb2H2 60gtaHPbEBYrM3UtDNGNgOFfj96PH8fA=; b=fJ6kkfYDn3KQ6shXEvD5Q3uqQR4 8GNTg+aD9oSpshc1SUYkQ1DdIXsR0N/fcaeGfyoHV4xKEVFI7iiZXrR4hAPMskMz 7tHgnRvZ9XXREaK5hpUww3cvqQYCIHWXt1CwDZ9F49eR7RMMwg9rYH2lvcW97zcL 8HLQOmz75+EwnlkddogWCLGESPZIg8LjcTytuh8Wx0G1rQXbfdw8GAlCP7ZMCGjc 1huqPLODNZdQdl4PMl8XW1afJqXFOVxIaFnaWoVN/4CJTqLXEQJS0ZYSYX6nBx5a 6gqVa41jBh2roHre2gqdPlwNyqjeSYWQGddaUwADGLQfVlL2GccNKfDqzCw== Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cxfsmhkfs-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 16 Mar 2026 17:14:42 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-8cd91c0262fso176605685a.1 for ; Mon, 16 Mar 2026 10:14:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773681282; x=1774286082; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sttkd7eb2H260gtaHPbEBYrM3UtDNGNgOFfj96PH8fA=; b=csOpmZAgH7zrObh3zfdQIfbW80qqVNvgblnQhp7atGFEtEIaRybIfQPawKyqla5eoq X/jq2SDWDytlQYi2i4PbwtIJyMCUFnbEFnbEhlZFH4PH3XL/KEEPT5WYiU9Aee/c33Yy XBNJqhajb+A7R7WETCBd4vVpEbTYR+jhK5oMC2Kb4K84Qf4RmeHeOWqrv0SRr766WWIH MmfsxxoUdPYjFrN+7MtHvSgA9YSjCZSFZnnpILbNMRS4/9zui+rFfyYUr+F7HB4Fts/u 2EGWfJaFNuPVslLVFUQ0RE0+Fd8p7LFe8L/ArRWoa2duCFxPXgWlIfQokX8F79TK9y4m 9lIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773681282; x=1774286082; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=sttkd7eb2H260gtaHPbEBYrM3UtDNGNgOFfj96PH8fA=; b=ZoTQRJCRW1e+Dr6tcuFMlzLxTBHoIi9lSmT/2mFzwv0Qx8+qU2dxujAKrHH3S4fgek QYi+gHLw+5Xy0Qr5Pqm9xBHXT42NscIb9/MJFwF0eY+UJ3GVszLBoLd0teiy0lN4sLAl zVYCuZH71aNRSDQrU/LC+k2o1SfRpcCpwuHSmk/QmFGnxWh8c6Uu5DW7rgYhL+1kFCLN U/cHt6xMFR0UMNWelI2K3bTC43BfL/aagmLNVDkX3ryZ6jQGOs6ZmtWn1vRKve7VGzBq XiMQbigSedjq/rTZoWc5Co+CgJM/sSLHcdJtfQ9eoekvWYNdhBDerQzjZYmvroCmHN+z 2lsQ== X-Gm-Message-State: AOJu0YzvNf3lIrX8KT5wQmqk0QBkO0IasIoytsHPdGrRpgRbMkBAPwAJ 3zkfmq2TdMDvjHNklHiJHjJk31P9h07Ks9MFV/S4/0pR4O2ZkiECwyGZ7dtCt3cfLF/K5Sxfp7w V3pUeO8tkQrh6HzEn3AQOhBz7KPhsbn1YE7/cT5Ni8AXYJETWj5OLDvn2rgaZa+W05V8= X-Gm-Gg: ATEYQzxZ5QJQ35wE2lqNykijZvt7zM6BOovr62EKC/ISFSUzzsau5/8qRznoqk+tnC6 TUWljUFFZ+j6j7vpdxIcjHiP4EFUaRMGzXjt9MyZbDy7XoCgCKB12bPNy6+Z1Mk9dS1NJjw0ujD zJeSSLMDNCQeuZLTjvz5/CRdqdbtePs5eL+F5NgTb1RGYPKN8YY43wrFsPo7K6HHFpz3qXutC/y Pjouq+0d+xzNiMvflsD/MSvZClvAZReMIRQzSZA7H0Dnsxf6VkKpE+4WkGawhWxquwVPtGMQyBd Xk8FxQohBs1+jw+509LZnz+UbAdmLZyNiTBzeb1GTUdDrD0bdAw3wYx9FpBq0ybxJeWoqS3VO63 vavsROy4aqMkXRcIRIkLE/rufiGIzWYLWipjVJG6kuuiqmjaDgw== X-Received: by 2002:a05:620a:1707:b0:8cd:b2e9:b964 with SMTP id af79cd13be357-8cdb5a0c51bmr1603122385a.10.1773681281521; Mon, 16 Mar 2026 10:14:41 -0700 (PDT) X-Received: by 2002:a05:620a:1707:b0:8cd:b2e9:b964 with SMTP id af79cd13be357-8cdb5a0c51bmr1603116085a.10.1773681280946; Mon, 16 Mar 2026 10:14:40 -0700 (PDT) Received: from mai.box.freepro.com ([2a05:6e02:1041:c10:5dfc:3995:22ce:d286]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439fe20b544sm43860993f8f.20.2026.03.16.10.14.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2026 10:14:40 -0700 (PDT) From: Daniel Lezcano To: konradybcio@kernel.org, andersson@kernel.org Cc: linux-kernel@vger.kernel.org, Alex Elder , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jeff Johnson , Mathieu Poirier , Srinivas Kandagatla , Jaroslav Kysela , Takashi Iwai , Kees Cook , Greg Kroah-Hartman , Arnd Bergmann , Mark Brown , Wesley Cheng , netdev@vger.kernel.org, linux-wireless@vger.kernel.org, ath10k@lists.infradead.org, ath11k@lists.infradead.org, ath12k@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-sound@vger.kernel.org, Dmitry Baryshkov Subject: [PATCH v2 2/4] wifi: ath: Use the unified QMI service ID instead of defining it locally Date: Mon, 16 Mar 2026 18:14:12 +0100 Message-ID: <20260316171419.2619620-3-daniel.lezcano@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260316171419.2619620-1-daniel.lezcano@oss.qualcomm.com> References: <20260316171419.2619620-1-daniel.lezcano@oss.qualcomm.com> 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 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzE2MDEzMyBTYWx0ZWRfX1HU/pCD6wxns zCh9RgNTbrQOtsDt6eHmpN/oW4OUOSu7cuEcAV5J5EZF8LOsTY313sc3pDtud27t2MfmInBtcFt BerG7M/gzfq+MQg+UaWINoOW0ArqE1lzNuR5Zr9BeN859wjz4RRIzxVTk3t9KNPCQ92caFRN/cm 5+i6dxGZTChBgIsyL9MaleFuCya3isp99nR4DjPfIBUi80//i6suXx+iJQIgigChPsrCS6d1HN/ CoGTX/uxrIj73+0lbJr2EeyaNiAXwdTX/wFUp1gwXp6rtTloiuK8V5zTg9M229rxDXPLb87hHKw ZbK109PmPP9r9XkUff20NCFFTfGrnc2qQ+bPCWkZMSoQE19vNiVYonO5F0FW/WDehyKCRvqy3Hu hx1nsh1mMPrGQgOXUoH976CTRZ6wZegpK5xSlw6T7UJuilETch0C1nR2n8KY7xz3S7maGB0flYa XzkTjQkEX2Mrkkjww8w== X-Proofpoint-GUID: DYRnEvoGpJ87WrCPgFpmxKlK-7PSy-P9 X-Authority-Analysis: v=2.4 cv=V/hwEOni c=1 sm=1 tr=0 ts=69b83a82 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=EUspDBNiAAAA:8 a=DFXFU3FfpSgEbJi8yTMA:9 a=NFOGd7dJGGMPyQGDc5-O:22 X-Proofpoint-ORIG-GUID: DYRnEvoGpJ87WrCPgFpmxKlK-7PSy-P9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-16_04,2026-03-16_04,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 impostorscore=0 malwarescore=0 lowpriorityscore=0 adultscore=0 priorityscore=1501 clxscore=1015 phishscore=0 spamscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603160133 Content-Type: text/plain; charset="utf-8" Instead of defining a local macro with a custom name for the QMI service identifier, use the one provided in qmi.h and remove the locally defined macro. Reviewed-by: Dmitry Baryshkov Signed-off-by: Daniel Lezcano Acked-by: Jeff Johnson --- drivers/net/wireless/ath/ath10k/qmi.c | 2 +- drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h | 1 - drivers/net/wireless/ath/ath11k/qmi.c | 2 +- drivers/net/wireless/ath/ath11k/qmi.h | 1 - drivers/net/wireless/ath/ath12k/qmi.c | 2 +- drivers/net/wireless/ath/ath12k/qmi.h | 1 - 6 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/qmi.c b/drivers/net/wireless/a= th/ath10k/qmi.c index eebd78e7ff6b..4fdd0af415d5 100644 --- a/drivers/net/wireless/ath/ath10k/qmi.c +++ b/drivers/net/wireless/ath/ath10k/qmi.c @@ -1105,7 +1105,7 @@ int ath10k_qmi_init(struct ath10k *ar, u32 msa_size) spin_lock_init(&qmi->event_lock); INIT_WORK(&qmi->event_work, ath10k_qmi_driver_event_work); =20 - ret =3D qmi_add_lookup(&qmi->qmi_hdl, WLFW_SERVICE_ID_V01, + ret =3D qmi_add_lookup(&qmi->qmi_hdl, QMI_SERVICE_ID_WLFW, WLFW_SERVICE_VERS_V01, 0); if (ret) goto err_qmi_lookup; diff --git a/drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h b/drivers/net/w= ireless/ath/ath10k/qmi_wlfw_v01.h index 9f311f3bc9e7..88d58f78989d 100644 --- a/drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h +++ b/drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h @@ -7,7 +7,6 @@ #ifndef WCN3990_QMI_SVC_V01_H #define WCN3990_QMI_SVC_V01_H =20 -#define WLFW_SERVICE_ID_V01 0x45 #define WLFW_SERVICE_VERS_V01 0x01 =20 #define QMI_WLFW_BDF_DOWNLOAD_REQ_V01 0x0025 diff --git a/drivers/net/wireless/ath/ath11k/qmi.c b/drivers/net/wireless/a= th/ath11k/qmi.c index feebbc30f3df..1397756d6251 100644 --- a/drivers/net/wireless/ath/ath11k/qmi.c +++ b/drivers/net/wireless/ath/ath11k/qmi.c @@ -3337,7 +3337,7 @@ int ath11k_qmi_init_service(struct ath11k_base *ab) spin_lock_init(&ab->qmi.event_lock); INIT_WORK(&ab->qmi.event_work, ath11k_qmi_driver_event_work); =20 - ret =3D qmi_add_lookup(&ab->qmi.handle, ATH11K_QMI_WLFW_SERVICE_ID_V01, + ret =3D qmi_add_lookup(&ab->qmi.handle, QMI_SERVICE_ID_WLFW, ATH11K_QMI_WLFW_SERVICE_VERS_V01, ab->qmi.service_ins_id); if (ret < 0) { diff --git a/drivers/net/wireless/ath/ath11k/qmi.h b/drivers/net/wireless/a= th/ath11k/qmi.h index 7968ab122b65..eae416db8b52 100644 --- a/drivers/net/wireless/ath/ath11k/qmi.h +++ b/drivers/net/wireless/ath/ath11k/qmi.h @@ -15,7 +15,6 @@ #define ATH11K_QMI_MAX_BDF_FILE_NAME_SIZE 64 #define ATH11K_QMI_CALDB_ADDRESS 0x4BA00000 #define ATH11K_QMI_WLANFW_MAX_BUILD_ID_LEN_V01 128 -#define ATH11K_QMI_WLFW_SERVICE_ID_V01 0x45 #define ATH11K_QMI_WLFW_SERVICE_VERS_V01 0x01 #define ATH11K_QMI_WLFW_SERVICE_INS_ID_V01 0x02 #define ATH11K_QMI_WLFW_SERVICE_INS_ID_V01_QCA6390 0x01 diff --git a/drivers/net/wireless/ath/ath12k/qmi.c b/drivers/net/wireless/a= th/ath12k/qmi.c index c11b84b56f8f..f31cba7af722 100644 --- a/drivers/net/wireless/ath/ath12k/qmi.c +++ b/drivers/net/wireless/ath/ath12k/qmi.c @@ -4061,7 +4061,7 @@ int ath12k_qmi_init_service(struct ath12k_base *ab) spin_lock_init(&ab->qmi.event_lock); INIT_WORK(&ab->qmi.event_work, ath12k_qmi_driver_event_work); =20 - ret =3D qmi_add_lookup(&ab->qmi.handle, ATH12K_QMI_WLFW_SERVICE_ID_V01, + ret =3D qmi_add_lookup(&ab->qmi.handle, QMI_SERVICE_ID_WLFW, ATH12K_QMI_WLFW_SERVICE_VERS_V01, ab->qmi.service_ins_id); if (ret < 0) { diff --git a/drivers/net/wireless/ath/ath12k/qmi.h b/drivers/net/wireless/a= th/ath12k/qmi.h index b5a4a01391cb..2a63e214eb42 100644 --- a/drivers/net/wireless/ath/ath12k/qmi.h +++ b/drivers/net/wireless/ath/ath12k/qmi.h @@ -15,7 +15,6 @@ #define ATH12K_QMI_MAX_BDF_FILE_NAME_SIZE 64 #define ATH12K_QMI_CALDB_ADDRESS 0x4BA00000 #define ATH12K_QMI_WLANFW_MAX_BUILD_ID_LEN_V01 128 -#define ATH12K_QMI_WLFW_SERVICE_ID_V01 0x45 #define ATH12K_QMI_WLFW_SERVICE_VERS_V01 0x01 #define ATH12K_QMI_WLFW_SERVICE_INS_ID_V01 0x02 #define ATH12K_QMI_WLFW_SERVICE_INS_ID_V01_WCN7850 0x1 --=20 2.43.0 From nobody Tue Apr 7 02:40:30 2026 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (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 73AA13D1CC9 for ; Mon, 16 Mar 2026 17:14:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773681286; cv=none; b=sWMw3U+bV9/gtcS+V97eSfv1rOLOZCABYCO/I8pv4eeG1oD+9DSdF5k/W7G2KChaYAdS1a3crWT4cJLeWlVjWsL/oQrD49Q5Cf/dBlPKZQdD+OlE4tyee5ttko/e0XjwjsksVh7k94RVDzF7ggkk2Jcu+xh+NvfprJmi6eTuS5Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773681286; c=relaxed/simple; bh=UocqjRyfFzM84DjFYioQo6kEjdPifFN5KCFxnX+Mtbk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Zu0KrSet16gHXlBsg4b+u32cZbsVrdWrt4TSirLfyG1HxUMvBeMVV4lxS382ziacnYcXnq9z9C0Hil7bxszYTUpWj4G6O3WNR9Ju1GkNkjIuO2fuAfi7qxber1/QxYkxdmWVKmf2NJaQdRwANsjZcWIsmlW6ZKwgvyYdykMsGPg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=P3DU6dl3; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=NrqvfI+8; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="P3DU6dl3"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="NrqvfI+8" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62GECKsD1639183 for ; Mon, 16 Mar 2026 17:14:45 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=WFXy8rqV6ZJ yXTmDCC1XrXB5vrLD+ozr+xme7NcdKiQ=; b=P3DU6dl3c9C+mKOoFj8fLnflTRc E4S7OufGIBneH7YqP+NWIVKQr0JamAB0ccP/h1Fu1YGnyp4csg0npjgoFeixW8JR Vxl/OXVJfgmTwzF4Vn7J2fQ1stksLuZyNanswJjCeX+tEvcw4wn+3J9ef+QTeG1n nsaaszMiZ/kCXgERsFktG+NFb0XemxxH757PA/JfVm3NnNUUQzrGnDx49KGDygK7 pFlzs5B2WwtrEU11sYGr3Wy7XXdUOW1/NAVcRbrPi0lKxckc1uUQdMkQ34QJ+ljV 4HrjH64gyE1cItzRHI72edpT4EBGjx60xlN9Izp4/hJP4ItIfIEv51VQ86g== Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cxke08pw1-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 16 Mar 2026 17:14:44 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-8cb6291d95aso5381466385a.1 for ; Mon, 16 Mar 2026 10:14:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773681283; x=1774286083; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WFXy8rqV6ZJyXTmDCC1XrXB5vrLD+ozr+xme7NcdKiQ=; b=NrqvfI+8EHRd+MVD032RWKR2d12VgpuKL0Oqd8RkWQ1N3C9JTANmVroK70M8+0/5Oj UdT6yk8N+cfZUkfq6S6R63zOLGOe+1THxBqMTKkmmHhx8Vt9jpMOR7KrW6Zy8mj28nNj Qffy16hAr4shMxnIXDgrvmOU1QXptyiaCfAZPP+GsXMc7CN4OfufezD+8WrkeYNLBesK oLv7RxmZLhX1y2B+9whenBjnhkoS7n8WQlTsq/3KlN0likuiOvykEDn4sWBRIpzcebsf E+XXGp3hKBfavX5GT7pPjfe2iRXfrFTuSLnzaaKLiMqIoD3k1Xk1B5PuExL2W47Bap6j +/qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773681283; x=1774286083; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=WFXy8rqV6ZJyXTmDCC1XrXB5vrLD+ozr+xme7NcdKiQ=; b=VkL46JJHUy2RncfqwDCriG3YoGT+1zzqWokPQqOb5aR5cYDH3ckovKuKMXDrCf+K4X 5VJQgMjNgSK2SchCV/DYkFa94Q2lS5pZACzRkdyo8NLLxL2y6nUNBiByZCpCATHKO6kz QteoCtKG3yjt1UOnPw1rPGAbfGMyfTMBAM31TR++5GTmy5Wt/2hd38D8RNAB7iHJ0mAt eNLpONBUx+kdH8o+rqz9UQbsItmVO7R+4HkBypULSrp3ePY/6djoVyvkiEiSglF/TGQY 7kCsNnJlzB4aHKbWUlspt9O4D1JmAaTjjGQzH99UF8ZnVVZeCB/a2S/wtAmeZpQoOVqU 5iCA== X-Gm-Message-State: AOJu0Yz3mkfQkiHPUMJvPFVocNkw2oa7JpjI9CrRLKpHYVeaVmiluZ/0 XJRYhL47EljYF6F/lqVT+IPa2Lr+KXMm4NiG2yTcg+H4xee4+s+8C6NrAIWRnQxuPc1f6CAGsAL CjfV4IcXvUhFlLUHyQ8HR419B6vJ83ODmRblVcNcicycpnzX4ZAdG7LPXg1Mtn2Hm154= X-Gm-Gg: ATEYQzz4x8cFnv4Dzr4TXOXydOimFcvwRHdYFJe2AE4djuUVnyxt8GXXgNeouASJnRW 4jw91vb1LXGtW8wmAhx83NycKB98oTLznewXjIe4iOVdmwjC7Ag0w0QGLu9UhDqKiPtyx4P7Jqb woQWLatIXDX61lQF66VhclIWdJ4MpaclJ28T+c4qiQMv5Cvge21owK+lbILGYcL0Z6IBEFbxRgW exKXZushj83f/OqcD8DtvJozq1aqTyznTyUSXWv2Rdy5ocPvnHPCq4gCZ7xqWnD7AYiBW06nC9T i1KKrXXp3631R6HIHgisVZyG7GZF5Ld+pdKho+dPwaxEVBS59Y7qE+NceexV0i/4hqBpRgO4y9Y LowbNDx+NLYY6uw30m3LGSIAk4VakCY9QC8i80YDUz3UUiCHNEg== X-Received: by 2002:a05:620a:711a:b0:8cd:b3da:5b5b with SMTP id af79cd13be357-8cdb5a4b098mr1839479085a.10.1773681283379; Mon, 16 Mar 2026 10:14:43 -0700 (PDT) X-Received: by 2002:a05:620a:711a:b0:8cd:b3da:5b5b with SMTP id af79cd13be357-8cdb5a4b098mr1839472185a.10.1773681282736; Mon, 16 Mar 2026 10:14:42 -0700 (PDT) Received: from mai.box.freepro.com ([2a05:6e02:1041:c10:5dfc:3995:22ce:d286]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439fe20b544sm43860993f8f.20.2026.03.16.10.14.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2026 10:14:41 -0700 (PDT) From: Daniel Lezcano To: konradybcio@kernel.org, andersson@kernel.org Cc: linux-kernel@vger.kernel.org, Alex Elder , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jeff Johnson , Mathieu Poirier , Srinivas Kandagatla , Jaroslav Kysela , Takashi Iwai , Kees Cook , Greg Kroah-Hartman , Arnd Bergmann , Mark Brown , Wesley Cheng , netdev@vger.kernel.org, linux-wireless@vger.kernel.org, ath10k@lists.infradead.org, ath11k@lists.infradead.org, ath12k@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-sound@vger.kernel.org, Dmitry Baryshkov Subject: [PATCH v2 3/4] slimbus: qcom-ngd-ctrl: Use the unified QMI service ID instead of defining it locally Date: Mon, 16 Mar 2026 18:14:13 +0100 Message-ID: <20260316171419.2619620-4-daniel.lezcano@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260316171419.2619620-1-daniel.lezcano@oss.qualcomm.com> References: <20260316171419.2619620-1-daniel.lezcano@oss.qualcomm.com> 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 X-Proofpoint-ORIG-GUID: jpqZjZ--QAYEPVxRqSE7O63D6IYYtl3m X-Authority-Analysis: v=2.4 cv=aue/yCZV c=1 sm=1 tr=0 ts=69b83a84 cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=xqWC_Br6kY4A:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=EUspDBNiAAAA:8 a=PhtMypRRY1SmXJO8NnMA:9 a=IoWCM6iH3mJn3m4BftBB:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzE2MDEzMyBTYWx0ZWRfX35FnaJ45ccSX 9qYPUAnAlvdUCZdOpGdmnKjoamaluOQ7oRWoCOED2jumIdJ5JVnLEqxaKFhpXyTrHduMuFJaGWY +12D1xAg3myjR0cBQ1vg2WXG5l/qJL3Sx/oaiy664eAnw4vpBgOW9Y1QmOfHFjkcE5r36aMG6qp SHB3SpUE0prZU0ThJnaGca6V7SFEXK0EANJP2X+gYfWKdZ8q23S72uoIm/BfMKweNYRfMRCR/zK iGlO/Q1xerhWv4nyM1mGY3m8kJmIQngltRJlLWMufDYGZ7chAs7+QK42dDhy9MiXevlTlPMVAzD vomi99DbDQI3OVvX55K/MTAKK7AmNLi4m8umzrEqvbbGGo0eGdLDMxG/5Z7V4z9YXHaCgRleV2B pGT+jmyXdK6FHjGYw6T8Sq8c2lHBO2Pi8Q8KLsjRew+JnmjpQ6reMJOO7lSG5aKwVJfqDA9Ew1F 63+iEK2XiWQVrh2Oi9w== X-Proofpoint-GUID: jpqZjZ--QAYEPVxRqSE7O63D6IYYtl3m X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-16_04,2026-03-16_04,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 clxscore=1015 phishscore=0 lowpriorityscore=0 malwarescore=0 bulkscore=0 priorityscore=1501 adultscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603160133 Content-Type: text/plain; charset="utf-8" Instead of defining a local macro with a custom name for the QMI service identifier, use the one provided in qmi.h and remove the locally defined macro. Reviewed-by: Dmitry Baryshkov Signed-off-by: Daniel Lezcano --- drivers/slimbus/qcom-ngd-ctrl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctr= l.c index 9aa7218b4e8d..0b88b8577bdb 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -48,7 +48,6 @@ NGD_INT_RX_MSG_RCVD) =20 /* Slimbus QMI service */ -#define SLIMBUS_QMI_SVC_ID 0x0301 #define SLIMBUS_QMI_SVC_V1 1 #define SLIMBUS_QMI_INS_ID 0 #define SLIMBUS_QMI_SELECT_INSTANCE_REQ_V01 0x0020 @@ -1408,8 +1407,8 @@ static int qcom_slim_ngd_qmi_svc_event_init(struct qc= om_slim_ngd_ctrl *ctrl) return ret; } =20 - ret =3D qmi_add_lookup(&qmi->svc_event_hdl, SLIMBUS_QMI_SVC_ID, - SLIMBUS_QMI_SVC_V1, SLIMBUS_QMI_INS_ID); + ret =3D qmi_add_lookup(&qmi->svc_event_hdl, QMI_SERVICE_ID_SLIMBUS, + SLIMBUS_QMI_SVC_V1, SLIMBUS_QMI_INS_ID); if (ret < 0) { dev_err(ctrl->dev, "qmi_add_lookup failed: %d\n", ret); qmi_handle_release(&qmi->svc_event_hdl); --=20 2.43.0 From nobody Tue Apr 7 02:40:30 2026 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (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 233F63D0921 for ; Mon, 16 Mar 2026 17:14:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773681292; cv=none; b=MmhfT4jKgvflkdF0L2fofjH4VeTRBhreNpqWYvYy2vsjGl2MSJxLLarnnR838xiUPqxtsNM5hQcSivJ2UoNMBlCYvHCy8g+zsrO+rmH99AlDjNC7gxLLyDE/bs5y+C5VJbAVvA/ER1qsjHr7l9wcd8kr1UQhgXcRC1wmlHT2hTo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773681292; c=relaxed/simple; bh=HtFIHBv2fwd3CfESxvQmQ/xugQw0YlUT46/6770djq4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=unAMUlbWKm6swvk3qXMSlFm/r+qXLtoTZ7oE/DNv/8Rir74vkf65SGF+6ENfNHRZ13vqaGB/IEVHrXcRsg3dpfh0OswjyJ3i7kV63gZqc3tDCybXslrpsmFUxJ7w61XOvEBwMlgP8gN3rMoKE4RtEmszHi2Bqx4owEBmqs8UL6I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=kfegwWmK; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=ewxQnOCL; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="kfegwWmK"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="ewxQnOCL" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62GF4Nhk795437 for ; Mon, 16 Mar 2026 17:14:50 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=ZoAGvqbvmk8 WgSq3LDSsC0+/Kn2gQStwEGDclAd8WF8=; b=kfegwWmK+oeYWJpckng+sZks14U rsp48Lfzham+N65Zre+9ESiRr5oysAv2RkJYK7Y+U1U3MM/CnD8fkCkDZkAOrGUW Hpx6CYpG+On9figKHVPAr45yictYQnhXhAUrutjya7i9Xr31yLY/RKA6S+hzO5ZA tVsYisIr+HoXh9INI1/BlXHpPS0mSWQneF1qU4EmtOOvJVzdC5r7dKj1v6MmYSNe MiNWiBBVxfLFnBIb40R0DteoqRIwA7azcqxzpQp9Jw3OycFuhBKR6sDy8FoVAiun FX7nQKMr8eGtigtM96RpSP4VoX/itwoVqd0fo0XuZ0vROwJT3T3e8omsNSg== Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cxm6d0g8e-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 16 Mar 2026 17:14:50 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-8cd7ea0bb20so2841686485a.3 for ; Mon, 16 Mar 2026 10:14:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773681289; x=1774286089; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZoAGvqbvmk8WgSq3LDSsC0+/Kn2gQStwEGDclAd8WF8=; b=ewxQnOCLd2STVMDUb82XtgHi5yW+EPxLZ5lUpZ92ms51CuK5/5RD64dhOyZr3pvbyz +Qj96wSS+WafM7BPVTV3BRW/2ClOaaTQXWdbzLdnLRziEcuxIw0CRuSzdHnYaQxe3R6T 3PVkf0vNVEJOY/eM3TXT6W+FIQINzh+JBi8w0Gm2qAvtQ5y3N7oYZTtQdE8tkH7wZ9NL /acwmtVCNC1MALsT4AAc3ecNThRkUzdNvgMRwSfjgh4vz8I/yZ7FsD09EGpmg1GKFyLV Oyrkyxb1MCgQVEC/tIJZFi+y6dCftuYXxe0aqc9zj9QsLEBYVtCSJIFKr1Wa2UBEx3Hz UElA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773681289; x=1774286089; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ZoAGvqbvmk8WgSq3LDSsC0+/Kn2gQStwEGDclAd8WF8=; b=rJl4RRltr39nghO1lQQuFH+6ao8W1kNIQiDSqPLXr3Gmkx7WgmBOMi5FXvc0CqA+vP qZ72GccZDB1WvocP3vA2gbtPEWrig+gF1mBZX91MphZT8iQqgdMF/2ApU56xk3quh5pA Asq1vIcy9JvY+Doe1rswcp3l0Cj76OLU0U2yRAQ2uRctndEEopHLR+rZvy2J96slE596 z3kORCPdj6YYQHU281aXN8XRvwpvTkKFaHjKMHdEb78nkoJgLMZ9iulZe4ntRsf2iAc4 NmC5SN5qVn2enWrm0v6pnhW1z33tKuGMfwKXMqd24lClt9yBGEuZMwQTbYfDIjqNKNqM Sk9Q== X-Gm-Message-State: AOJu0YwjI7I9CLmKmhH5pGy+XmIOYA79flbu/7i1apt53qjVatot0Exh 5O/PkehtAzz6y560wchka90nkWgh4m6b1bG/jba4GWnA/AQbTU0AiPr/Wsku2dhU7VVt9cgwkYD 1tkz5gNUcVmqn4CdyDDyVRQrLetpbJuugTM5e3Y3aeyEL+a0l6wm9Kkf3Ur0E8R4gBlV5Q3yVg2 4= X-Gm-Gg: ATEYQzxX4j+jF/JgheWST/cP2lA+0lZ0MPVNcYru1es5tuWYvABECULw7u1cNz6iT6I HL+A4rBjN1LYgEHLlsLePbnGIyHKEytGJaWn7wNJ2bxMDPxOJKIXmllTwDPjQ1Sg+Ws03LqLdG5 8jOquDsVJhYvtYzU8kgk7SfOVtTnxLuJbu4JrDuzTzBx5d6WmbZUZ2bx3zzauXsJzj3Olr8T5Gl JZCjKnI9IdmxcuPTZfdt6T/A/vf3r26ztyrr1RMaQkWvHDw6cAerbGSz4rVZosRO4NHLH/nh0GV 03uFwdRFhnFLVgWHQx33XxTiAlalbhpZdhCkBCg4/6S9oq0XQA42sbcOBonlwGZE2Jl3ojqox2S +yWhtgs/Jey4DMOX/UOwMiTtAbr2ZnXuSMqptOLCMmwTcESnLFQ== X-Received: by 2002:a05:620a:4d5:b0:8cd:b626:cdf1 with SMTP id af79cd13be357-8cdb626d117mr1319003685a.46.1773681289308; Mon, 16 Mar 2026 10:14:49 -0700 (PDT) X-Received: by 2002:a05:620a:4d5:b0:8cd:b626:cdf1 with SMTP id af79cd13be357-8cdb626d117mr1318998385a.46.1773681288653; Mon, 16 Mar 2026 10:14:48 -0700 (PDT) Received: from mai.box.freepro.com ([2a05:6e02:1041:c10:5dfc:3995:22ce:d286]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439fe20b544sm43860993f8f.20.2026.03.16.10.14.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2026 10:14:47 -0700 (PDT) From: Daniel Lezcano To: konradybcio@kernel.org, andersson@kernel.org Cc: linux-kernel@vger.kernel.org, Alex Elder , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jeff Johnson , Mathieu Poirier , Srinivas Kandagatla , Jaroslav Kysela , Takashi Iwai , Kees Cook , Greg Kroah-Hartman , Arnd Bergmann , Mark Brown , Wesley Cheng , netdev@vger.kernel.org, linux-wireless@vger.kernel.org, ath10k@lists.infradead.org, ath11k@lists.infradead.org, ath12k@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-sound@vger.kernel.org, Dmitry Baryshkov , Dan Carpenter Subject: [PATCH v2 4/4] ALSA: usb-audio: qcom: Use the unified QMI service ID instead of defining it locally Date: Mon, 16 Mar 2026 18:14:14 +0100 Message-ID: <20260316171419.2619620-5-daniel.lezcano@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260316171419.2619620-1-daniel.lezcano@oss.qualcomm.com> References: <20260316171419.2619620-1-daniel.lezcano@oss.qualcomm.com> 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 X-Authority-Analysis: v=2.4 cv=c7+mgB9l c=1 sm=1 tr=0 ts=69b83a8a cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=xqWC_Br6kY4A:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22 a=EUspDBNiAAAA:8 a=GLuZV9TbpKr0kWuSc8UA:9 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-ORIG-GUID: xsjcUEewstZggXhB2gf-n4Gk5JrGB5MA X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzE2MDEzMyBTYWx0ZWRfX0aShLRQVklQ8 16CiR29OHmg2XgSFrv39JzjMzslA2MEEJKMFwOceDYvJxBtBN8oTPTdFJ7Uh6ekwCuJgzQZqSmo eIpqPDokSO6K9R07kMyk2r7wnJnX1j8MOjIRNZ7HNMkwhWOylIeSHqk3IBtYWiC6dGjwzzp/fKZ 1r5YDP+3pDnzGHy4x8mwOalKK4GcYXeuMueaACo7N3ZOQ5M2QUPxsw5fudQk/yvksH1c0RD75// 4mcaDQUO2XykvqVsbJtdYCnSLqOfif/VdbE3cB4A/YHEVizKumuAZYVyH1xjr6os28XL5yT3gz8 XvNNMndobkj5lFpkky5rCTskLHjEM9AcqVZQrBodva8NY1NOj9HxO3wtFeaPIVMO8qWL0kCjpy6 +K1TreroIHcGoHFisFSxOxASb742ml/+1i/45N/kPA8LBI3sUVWjiQQcg7VAiZQauQ/M19arhkg 8AHo+8IXY6/OctLN0jA== X-Proofpoint-GUID: xsjcUEewstZggXhB2gf-n4Gk5JrGB5MA X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-16_04,2026-03-16_04,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 bulkscore=0 priorityscore=1501 suspectscore=0 phishscore=0 clxscore=1015 lowpriorityscore=0 spamscore=0 malwarescore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603160133 Content-Type: text/plain; charset="utf-8" Instead of defining a local macro with a custom name for the QMI service identifier, use the one provided in qmi.h and remove the locally defined macro. Reviewed-by: Dmitry Baryshkov Signed-off-by: Daniel Lezcano Reviewed-by: Takashi Iwai --- sound/usb/qcom/qc_audio_offload.c | 2 +- sound/usb/qcom/usb_audio_qmi_v01.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/usb/qcom/qc_audio_offload.c b/sound/usb/qcom/qc_audio_of= fload.c index 01e6063c2207..38d36397bb40 100644 --- a/sound/usb/qcom/qc_audio_offload.c +++ b/sound/usb/qcom/qc_audio_offload.c @@ -1927,7 +1927,7 @@ static int qc_usb_audio_probe(struct auxiliary_device= *auxdev, QMI_UAUDIO_STREAM_REQ_MSG_V01_MAX_MSG_LEN, &uaudio_svc_ops_options, &uaudio_stream_req_handlers); - ret =3D qmi_add_server(svc->uaudio_svc_hdl, UAUDIO_STREAM_SERVICE_ID_V01, + ret =3D qmi_add_server(svc->uaudio_svc_hdl, QMI_SERVICE_ID_USB_AUDIO_STRE= AM, UAUDIO_STREAM_SERVICE_VERS_V01, 0); =20 uaudio_svc =3D svc; diff --git a/sound/usb/qcom/usb_audio_qmi_v01.h b/sound/usb/qcom/usb_audio_= qmi_v01.h index a1298d75d9f8..c7eee03225ec 100644 --- a/sound/usb/qcom/usb_audio_qmi_v01.h +++ b/sound/usb/qcom/usb_audio_qmi_v01.h @@ -6,7 +6,6 @@ #ifndef USB_QMI_V01_H #define USB_QMI_V01_H =20 -#define UAUDIO_STREAM_SERVICE_ID_V01 0x41D #define UAUDIO_STREAM_SERVICE_VERS_V01 0x01 =20 #define QMI_UAUDIO_STREAM_RESP_V01 0x0001 --=20 2.43.0