From nobody Tue Jun 16 08:55:37 2026 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) (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 6A6BA397E8B for ; Fri, 17 Apr 2026 13:11:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776431488; cv=none; b=Zy4eKZBWOKEfkrwCt3ow5Y4QkoBCISsiv/1O2Tx7S+UxLAzyf+Dw62LOXWMsYkOuoaRs16LFRY164HLZbEYI6tp3Qoj8jbxmZt7phWMSRbbZ7SaqZz0o0us0U8HpOA5BqyZs7SkHAMhsDNo2nGcwBm0ysApxVJeqbV3YLYEdqXY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776431488; c=relaxed/simple; bh=Klkglyq/jaqn07LVoY+DygFKlFSeY4mf3uyDS+66nUI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=UzUoc2JVECNhWCKfjDvP3UuKsN9Py/lEnhhht1MwnH/I1G62gurXuPe2LxMO4WfGzalTIvlH7LwB4BC/fpo2gknErVS5RBhoG9S4WHgg0q1BgPdTcyXm34Dsv78r5sABuNKxrA/L5Rp+lZ14fPm5vhCJx2znUXuA+C6XwYLA7M0= 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.20251104.gappssmtp.com header.i=@baylibre-com.20251104.gappssmtp.com header.b=kgat+i2O; arc=none smtp.client-ip=209.85.221.49 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.20251104.gappssmtp.com header.i=@baylibre-com.20251104.gappssmtp.com header.b="kgat+i2O" Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-43cff5dafc3so485377f8f.1 for ; Fri, 17 Apr 2026 06:11:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20251104.gappssmtp.com; s=20251104; t=1776431486; x=1777036286; 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=yLBJQur6L6abrgINbvpQqXST9x1YXfxN6XkkI5ZCGzQ=; b=kgat+i2Oa6Wy9zEOI65gHK3Zn9aMLrxwt/mf7bc7zAHG2PcE2wWKWhs+3MjkbcCAuz sd9N3EZ9kSFwUmKa20GXjKUvoKsXqum9lZAHIMOR+mVXLGphlnSmAjNKK776hHo3meip EXzDLnetciMhyrijIbsYGXjGhtibipFdHPOOjbaNzwu7LYQpF9lH8Jwt5JK3mGczK6Bw 6NMX4UmX0cqrdoitSk2b/Bn/QR89mLBjpoLJKkTwMKYlKX9gXxl5GQJ6mBjICKg6OsGp mbr1S5TM5yOF0ZQyapKPlZJnpvZnFqeGo+JZAE9NUYV0WczLVAnuxj7fFSOYRgbknC+a IGdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776431486; x=1777036286; 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=yLBJQur6L6abrgINbvpQqXST9x1YXfxN6XkkI5ZCGzQ=; b=IKj/im13zCXxnDmY0nMCx/gHNn1glz+w2qtVm6UXekd6O9LBEdwUUpl3Gkwke7KyPA I/e0KhHAcvRErU7Grd8wltbyRihjsk0772KX2lfEgETPtXH4fuaa0mQQJoPIg6pFEkNL +zB4aVer1IPcFfss7IFVKW8DcoQGwOfXWHRzuSjx6//9HhYFGZ635B9ql3wrYYPX+0zk vxk5sFRbMB3UZsMc+BlAxogAPg7jBxa3br+VN9rZQh0bEYvZ+lgsNYBcUTPzY8Z6HG4a gzp8c3nI3kAKcRxgqbFccX6mo2+k1D1IaEhv2ys+6/Woa2TmEjAMGyIyu6fB9QILWlCs tSZA== X-Forwarded-Encrypted: i=1; AFNElJ8e/391iI2+STKwARJGw2gAVXDe931+fumQUMRLaWKJzTbJVLU/W87z0Es3ZxcRx0kP2bpUFIZsQBkXL7w=@vger.kernel.org X-Gm-Message-State: AOJu0YxN5X3fLdhlZUtDXUgWNH7ehUum/7mM6X4Q9SO1JGFJG/XoCuvK cLQGvQu+1qq7XDivyC7O25vdFqxxLlyGy6m9UwC84Fu7orbWveqVOuGgyyDwn6aKmXI= X-Gm-Gg: AeBDieu+xDWPOaA7NkHgdXolDTGK963enJfwhGyjD2FSTltgY/FlOT2wIYetccu2CRX 1mkRhSyOBqFkE6KGV2ZYoNwabqvMsCHZnVlnzC34u4T+k4JS7T7Wkfz15C8HhVFtfQod8GyZHZV YFNKeDQRhdG1eD8j1dpy3G2Pwnm7V+ZiO5o0dbcnc7iMYsa13pRassbS/FUcr3y0mtuA2bp8bGN s/A/7g7M7DCkFOWswgVM75aUdk3gcxAygPLeLnOyjaO+KRZvYZmF/iwXMYtKv4qIYUC/0ywd+cA 00kKw0epAMHWETfho8iayfrbtd0ALLT/gYu1yyppM78eShZq00tV+rtpHBZrzRYQdxxuEV8BLJX /JHksb37pDfLddYnBO95c8W25gYi6ltYij1nxwEbgCbXXTeTSF+6I3HiKsg6ssCxu8Ea0H0x0kG wTY2z6zsEKMJJPzRQ1A1mfTlKI80Yt0W+rhVmA49bstFVA/QZmpXXp2NJhHYi9S/LdnCr0UAH/w eA8bvgWs5eNqEZNEgD9jcH+ X-Received: by 2002:a05:6000:420a:b0:43e:a69b:d813 with SMTP id ffacd0b85a97d-43fe3e0d459mr4571980f8f.25.1776431485775; Fri, 17 Apr 2026 06:11:25 -0700 (PDT) Received: from localhost (p200300f65f20eb08db61cfc60d8aa232.dip0.t-ipconnect.de. [2003:f6:5f20:eb08:db61:cfc6:d8a:a232]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-43fe4e4daf2sm4238766f8f.33.2026.04.17.06.11.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Apr 2026 06:11:25 -0700 (PDT) From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20=28The=20Capable=20Hub=29?= To: Ulf Hansson Cc: "Christian A. Ehrhardt" , linux-mmc@vger.kernel.org, Greg Kroah-Hartman , Wolfram Sang , linux-kernel@vger.kernel.org, Marcel Holtmann , Luiz Augusto von Dentz , linux-bluetooth@vger.kernel.org, Matthias Brugger , AngeloGioacchino Del Regno , linux-mediatek@lists.infradead.org, Ping-Ke Shih , linux-wireless@vger.kernel.org, Felix Fietkau , Lorenzo Bianconi , Ryder Lee , Shayne Chen , Sean Wang , Brian Norris , Francesco Dolcini , Andy Shevchenko Subject: [PATCH v1 1/6] sdio: Add syntactic sugar to store a pointer in sdio_driver_id Date: Fri, 17 Apr 2026 15:10:47 +0200 Message-ID: X-Mailer: git-send-email 2.47.3 In-Reply-To: References: 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=1594; i=u.kleine-koenig@baylibre.com; h=from:subject:message-id; bh=Klkglyq/jaqn07LVoY+DygFKlFSeY4mf3uyDS+66nUI=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBp4jFZkxQbj+KYt4Q9fEkJxuokeQF4k0Z8QVO3Q 7wAQaupW5KJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCaeIxWQAKCRCPgPtYfRL+ TtZtB/0YGCqVt5rVpLrWqCD44F5LfNFUgv/+TGPxayzQfsH7zoCBqE9UgsVpBkFZprUwAzLBPWG MPbj74nUaxJfky/T/6x/bsJ20CXFl14Aky5oeSqWXwpx/STsvR1t7BH1meFZ1chEsexFTdIwswa 8F2lrrBsAe+eGHk4UdYwOcEBLke8MRKu7X9WInf8735NDYlo6VkX6TwaQTxpOcTlNIDfwZlA6ON nlrxK4GTkQYXCmaFZYylJBpOTDYLdH8GJZthPQhYPW5w9D8jVeVUIanYYaSikHt0R/zyWaylAij O7+GqKklrjT08jMFR3/4DzejRKFhjlyBUA+HrbH74dCapvBS X-Developer-Key: i=u.kleine-koenig@baylibre.com; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: quoted-printable On all current Linux architectures sizeof(long) =3D=3D sizeof(void *) and this is used a lot through the kernel. For example it enables the usual practice to store pointers in sdio_driver_id's .driver_data member. This works fine, but involves casting and thus isn't type-safe. Additionally with the CHERI architecture extension there are machines with sizeof(void *) > sizeof(long) for with the traditional approach of storing a pointer in .driver_data doesn't work. By replacing the plain unsigned long .driver_data by an anonymous union, most of the casting can be dropped and it yields a working solution for CHERI. All users of struct sdio_driver_id are initialized in a way that is compatible with the new definition, so no adaptions are needed there. Signed-off-by: Uwe Kleine-K=C3=B6nig (The Capable Hub) Acked-by: Ulf Hansson --- include/linux/mod_devicetable.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetabl= e.h index 5b1725fe9707..0eb5d196f5b5 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h @@ -414,7 +414,10 @@ struct sdio_device_id { __u8 class; /* Standard interface or SDIO_ANY_ID */ __u16 vendor; /* Vendor or SDIO_ANY_ID */ __u16 device; /* Device ID or SDIO_ANY_ID */ - kernel_ulong_t driver_data; /* Data private to the driver */ + union { /* Data private to the driver */ + kernel_ulong_t driver_data; + const void *driver_data_ptr; + }; }; =20 /* SSB core, see drivers/ssb/ */ --=20 2.47.3 From nobody Tue Jun 16 08:55:37 2026 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 18F263A257C for ; Fri, 17 Apr 2026 13:11:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776431490; cv=none; b=fNtouOvSk/24o61yxVpm77ZfrytgKDhADbos+hi9lk6GaW0Epo9mUBQqAbUe9GXnu+X1ZGqsSIa7arDrQwG2cgV21El/1pj7UEu8OJ05Gz7nnL24ZL9eaigdmq5FxFGsihftNDZ9q6DyY9Dy8J0ThChQ7fcnWlrLVf5WzwdVb9A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776431490; c=relaxed/simple; bh=bvAJHksTfDk71mNNT7RHOppXcgzqFa+7JEkklg/iQus=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=EfF9+eMySmTw7kKRW25jHByHgwtEwBi6Ga/fZITyRMIaG70AEz4tOm2iCLZ0+Okn98rAsJTPwc3gRhE6oYUabqydRkJYF1jwjscW+/Jvd2eHDUmpAgyHtH39/4d7515KWbbtT0BCIKXXPHa9BqvOOk6cvW4LMzqurcf8p3iOWPY= 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.20251104.gappssmtp.com header.i=@baylibre-com.20251104.gappssmtp.com header.b=N7Ixws2s; arc=none smtp.client-ip=209.85.128.51 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.20251104.gappssmtp.com header.i=@baylibre-com.20251104.gappssmtp.com header.b="N7Ixws2s" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-4887ca8e529so5384025e9.0 for ; Fri, 17 Apr 2026 06:11:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20251104.gappssmtp.com; s=20251104; t=1776431487; x=1777036287; 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=OyDIpCgO+MvLXyp9uNgUQ/B36SV/tE2KaLWygaHVkwE=; b=N7Ixws2sdOw2LJlsBX/IAJOsODuO9jUsqbLoO2krAF4wHh6scjw0IlyQ8GNI5zHgKm wsrN+22jMxgAy0sc3u4ykby6f8b873N3uuen9kpwsrfUVGGh/y+t2ddyC6CvRvvKiN+h sdW2prDOtj3WaCg8C0Nt0jQDPTactO8Dw9RrhyWPsCi9cpD9TMPSzGfijQBHkw/5YsHb UR4UOxzt9CI8rzL5dkEwtlpui8LnnXvLITojvosSmFK0X9EcAPkDT7RbCrd16ft1iNOq DOvbxe+ktJzTkSs/g2Q7VnT/4zHGNNVwt0I82P38r0+AwktFMMmDYB2PSJ6EPJzNJJV1 sM0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776431487; x=1777036287; 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=OyDIpCgO+MvLXyp9uNgUQ/B36SV/tE2KaLWygaHVkwE=; b=DwEHz2COX8JZC8D3LABsAhvnykDvhuo74T7pOE8eeYxoOW4AHMPenaFh8auO+eISuf d9aumWGc3PI5oSET6aBmVd8z//nZWXsXeyZAaIgQMZjhTgsBoZs0gllCJfhgpyY89rqF DnysAXkss98OUKFRUdA77N1kSIFYEDRT7HUhTG2/ELnxWRCCoYAj6Bu8bSiU8siP3pEN p4iApfYzHM9Ppo/XZaIw9Dc46GDfcPDJhgmdp0x3/9hUXJVVg7hlRVttDJgfNIiyJVvA bN1gLIt8arcN9Q7l6bovytfquI3p78QqS98hAklzjY/I6p5SZL1lWCBpP+FZuFTOAUiW /ynA== X-Forwarded-Encrypted: i=1; AFNElJ+G69kJINB6nmVOUPJKheM5m6cdW9km2bTrtKHt6OINVqzrsdYyozV+CFs+AB7zw3vZNJhyUSj9xb0RyC4=@vger.kernel.org X-Gm-Message-State: AOJu0YwxOqb/lTm4VK/7RJRJBaSfPRrhrGBP0OenkWj/5P+gb/gK73df FoMl27FTz0Zvdb3IFPujq9BRRGbyO719Cwi2aqNg9mTBvzqRZ/oVq22P07KPe2WTOl1Ni43bD6C IEr9M X-Gm-Gg: AeBDies/E8mwCFRZcXksVmwqXHE58AAzOB/NdLP6BgTrvNpjNQw8T3a7MSF8dUrnIsh KkI+xWWIYIh6DYh/CB3+V3wcxtGnMtgPUlp05NDUxZWiUnvky00TA6OYvM5uIDwBFgiGIX9kHm9 rCUcyBNoJPM4ps8qcP6bZJZ38xelCW1ahS10XMmu6d39hNYKfbJt9LMyD2PCR7ii3ToLU7eqIyP 3KS6VO6oPIFpEcNFuIPTqkNBltdoFJBMS1LsSxs9p56SvBHWJ5hjZj4l8cPKOkUtSim1POCVgUg /sw5K7iyCFQ5TEKxmC910rnqltnEGqSjDUI56CFFXZYUSWAY5ePJu89/GbqMwe/1GEW4YfUt7L3 Ii+/IFxju8XJCMoZIZ7oEkfkcvF3MQo0QRabXGeIRDkP3GwHY1pJAz4+Hl7gTrdmer/eDUOzVUx BZpkV4pA6hqet7BbBeYUBRrasv06SMEVLloIxCurmLSh/Z/Q5C89GjY8thEDPiZrKVxq6s791W7 oj5y8H30l8dTRjJRJfsknoJ X-Received: by 2002:a05:600c:a411:b0:488:c239:d498 with SMTP id 5b1f17b1804b1-488fb89e84fmr28335545e9.8.1776431487458; Fri, 17 Apr 2026 06:11:27 -0700 (PDT) Received: from localhost (p200300f65f20eb08db61cfc60d8aa232.dip0.t-ipconnect.de. [2003:f6:5f20:eb08:db61:cfc6:d8a:a232]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-488fb7a0745sm21388425e9.9.2026.04.17.06.11.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Apr 2026 06:11:27 -0700 (PDT) From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20=28The=20Capable=20Hub=29?= To: Marcel Holtmann , Luiz Augusto von Dentz Cc: "Christian A. Ehrhardt" , linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 2/6] Bluetooth: btmrvl_sdio: Make use of driver data pointer in sdio_device_id Date: Fri, 17 Apr 2026 15:10:48 +0200 Message-ID: <73699b58d6a9edaf3d71862d7c480baaac390179.1776429984.git.u.kleine-koenig@baylibre.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: References: 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=3112; i=u.kleine-koenig@baylibre.com; h=from:subject:message-id; bh=bvAJHksTfDk71mNNT7RHOppXcgzqFa+7JEkklg/iQus=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBp4jFcVxihCGbUmETP5eFHZb6TwK1qp+L+H4Bih jyGIZDpIOuJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCaeIxXAAKCRCPgPtYfRL+ TkzmB/4nPhfVHaj4OOPuoi4xKGsOhTPtybr3HUsz4FJELuj4ojIFsSGWKpWT+ZXzi7z5Ro/pxia xhIKkAQ8yS8AXCO9McCpmahdFOD8+51MfgugN9ibCvcr/TRtlC1wDAlDZqTQInOCFDqNVhlfQ4f Tt+Q6hhq6bbya5LIK7gvq0jI8cb/jDGIwoE/CaYPu/j9WuqCV++ug+mvWsw+b9iFM2fzXR1FIwl VEAXCFAYoieW0UHV1X/NnA3GSQCvj1097tGQV7TWX8u+9ALMPkTunZ6/Kta4kKLBoAl0QGUB+rN ac1VBr0Da2dDFmstDxfAr044SVnB/KnumMsr98s6TpEKDfrf X-Developer-Key: i=u.kleine-koenig@baylibre.com; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: quoted-printable Recently struct sdio_device_id gained a new member to store a pointer to driver data. Make use of that to get rid of a bunch of casts. Signed-off-by: Uwe Kleine-K=C3=B6nig (The Capable Hub) --- drivers/bluetooth/btmrvl_sdio.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdi= o.c index 93932a0d8625..ad28bee56961 100644 --- a/drivers/bluetooth/btmrvl_sdio.c +++ b/drivers/bluetooth/btmrvl_sdio.c @@ -301,31 +301,31 @@ static const struct btmrvl_sdio_device btmrvl_sdio_sd= 8997 =3D { static const struct sdio_device_id btmrvl_sdio_ids[] =3D { /* Marvell SD8688 Bluetooth device */ { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8688_BT), - .driver_data =3D (unsigned long)&btmrvl_sdio_sd8688 }, + .driver_data_ptr =3D &btmrvl_sdio_sd8688 }, /* Marvell SD8787 Bluetooth device */ { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8787_BT), - .driver_data =3D (unsigned long)&btmrvl_sdio_sd8787 }, + .driver_data_ptr =3D &btmrvl_sdio_sd8787 }, /* Marvell SD8787 Bluetooth AMP device */ { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8787_BT_AMP), - .driver_data =3D (unsigned long)&btmrvl_sdio_sd8787 }, + .driver_data_ptr =3D &btmrvl_sdio_sd8787 }, /* Marvell SD8797 Bluetooth device */ { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8797_BT), - .driver_data =3D (unsigned long)&btmrvl_sdio_sd8797 }, + .driver_data_ptr =3D &btmrvl_sdio_sd8797 }, /* Marvell SD8887 Bluetooth device */ { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8887_BT), - .driver_data =3D (unsigned long)&btmrvl_sdio_sd8887 }, + .driver_data_ptr =3D &btmrvl_sdio_sd8887 }, /* Marvell SD8897 Bluetooth device */ { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8897_BT), - .driver_data =3D (unsigned long)&btmrvl_sdio_sd8897 }, + .driver_data_ptr =3D &btmrvl_sdio_sd8897 }, /* Marvell SD8977 Bluetooth device */ { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8977_BT), - .driver_data =3D (unsigned long)&btmrvl_sdio_sd8977 }, + .driver_data_ptr =3D &btmrvl_sdio_sd8977 }, /* Marvell SD8987 Bluetooth device */ { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8987_BT), - .driver_data =3D (unsigned long)&btmrvl_sdio_sd8987 }, + .driver_data_ptr =3D &btmrvl_sdio_sd8987 }, /* Marvell SD8997 Bluetooth device */ { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8997_BT), - .driver_data =3D (unsigned long)&btmrvl_sdio_sd8997 }, + .driver_data_ptr =3D &btmrvl_sdio_sd8997 }, =20 { } /* Terminating entry */ }; @@ -1523,8 +1523,8 @@ static int btmrvl_sdio_probe(struct sdio_func *func, =20 card->func =3D func; =20 - if (id->driver_data) { - struct btmrvl_sdio_device *data =3D (void *) id->driver_data; + if (id->driver_data_ptr) { + const struct btmrvl_sdio_device *data =3D id->driver_data_ptr; card->helper =3D data->helper; card->firmware =3D data->firmware; card->reg =3D data->reg; --=20 2.47.3 From nobody Tue Jun 16 08:55:37 2026 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (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 3E00B3A4505 for ; Fri, 17 Apr 2026 13:11:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776431491; cv=none; b=XU5PRYL5DQ04SqOefgxzEDsLEbKwTYORhC/1+SGHuwVMCWT4DR5t+UjI9ls1j1PuO01QcRkxjCHVAWhnN7ZRWQKLL1rl+E58598q83kv5A0bkw2N/YOBSWRCIoekHvwjj0BxaCEJJPOv8WnIYFXETNbY00WZG5JWnbl/tcsEaus= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776431491; c=relaxed/simple; bh=2l6+VruZCe2G92lMFTOG+EfNer+jq/4dC3nqnXbD9Bs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=bgbB4lXl0NDvI3pJMiNngD9hfmQAaROD9Xia/zAKLxsQd2heTe3vfQKWUAUkEbcCO7PxUVUNDC531OEgzmLtElatPr+x+/6Zxb9aX0M/nkagvobz776uPFHzzlt5FTGpkynMiBg3aEZgL7IOmzIPgYrxfWFTfpaeV0OkLRLt+pU= 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.20251104.gappssmtp.com header.i=@baylibre-com.20251104.gappssmtp.com header.b=q2TmRER5; arc=none smtp.client-ip=209.85.128.49 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.20251104.gappssmtp.com header.i=@baylibre-com.20251104.gappssmtp.com header.b="q2TmRER5" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-488a88aeec9so10242135e9.2 for ; Fri, 17 Apr 2026 06:11:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20251104.gappssmtp.com; s=20251104; t=1776431489; x=1777036289; 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=KiTXMXyGgbry+1smTdjpHYLgWhcXFX/mZbw63wGDKJA=; b=q2TmRER5keY5WW2wPfyZIUAAn9rMC5RCl3jgFM5/FFZzQTUpboDKSaokoh9xwLCZ1c Yw3ER8xaLSf2aUr7rVjNZMXHFNaA6Mb2P1LHSIGWmUkaJWmOH5I/8V7gnmqm+sljyv0u Q7U/Hs0ydITGwUq49QEi+fXnXTgZFgachTSrPyRc21rSAmWYu8i7X/O168XnJW+fDIn6 cVhsENzBNny27jVYf/l+uydYKOnIShDPI3ZEsOoIgZmrxVZqPUeuCZLs0FrVgPY9UoyG b9RvXS9bieCYyZJaVDMh1BmW8wk1yIdVUgqkQmVZJw80McuhI6dHaLN/M9dtPl2njWVM ZKVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776431489; x=1777036289; 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=KiTXMXyGgbry+1smTdjpHYLgWhcXFX/mZbw63wGDKJA=; b=JlEZKSahclmvqom3icPJnAbzkBLv0qQpr/L+Q8Cki4X7v92szT52q6C/MGoOd+VkXe 3ILjm8I56PcKvkB+nRIMOrkkzmkJi+M72d5aKxXmwqshn1hHX4BtY4eUvRS7i0GNhjOF l0rn4MU5z+d6DPH+lH+4jA+MKyixjKk7H1bAwPEnLFA7vQW7tPwuiR66L2mf/UktDljV fa7QF4vyoVIDnDK6GPF6yDcwfeZZNxwxxfpyFouKSIpmV/8LHpL5zS6InGlpiSObR6bt X26fQ/TNJuib1EpP4ktMLWgjwG4nyUgtFW5ANu+W7QP4ZfqNGDMtVpJnSbhRN7cYnr6Q OqCw== X-Forwarded-Encrypted: i=1; AFNElJ/nrjEwTE+vAL40g5w0mwHnnaMU/noLLVgY4tf0tLvMid3MjnrJex3A/xk4E7qyf+R/rMVrXolODbTU7sQ=@vger.kernel.org X-Gm-Message-State: AOJu0Ywh84uDrlaeneUCyO6q4vzDSoxreTIfHPujkGymPjlieFJxiDcD +nLINyPVUs2X6SxYJUDfjoJExDt29S0DT17CuMpJCN+R7gdASt3Qru8qN0twfT+PF7E= X-Gm-Gg: AeBDies4BTHf13QfGb/e7qsru6rj0sAxxli0FYzxSAOF5GTQi+88nhah/qiAJ+wxmME gqJ4S9jnKQnsG5X8OhJrbpa2m1VUAquOdy8zcqFkXqZeODZ9wQxniYMsdlVp77EfLNkH5aG8QB2 20mMDXMlBjX+RWKlEdGMaifczE0/CiYup0EASaiZDHpvhamAl0ZGUcUQj/Z8xWdcceVMPV0OMYK Xpk9RywdtXAidAlBrXjBtqTU1G+1/53zU+YIafOPSZrc+rNN9i9yAuK145B7dDXB3iY2SF2u8YV SzaPsWbjvtOezSJFk+KaiKJX1pfqoI+eXVJVeIE3DQxKp/FjQfr6Su8BMKdsD4IWtC7rjOBsm6Q fAsOMnQOPFuioGVfcSQuwXmn1hsdQcHKWbe3kToZRnbTTAwi+zsIR4ZGyp/hhCYAHJNZMO57LLF GKrN4Og3e3NJxXYcZFRs9gKSoK97wPqpfoDm6Y8HhnNkBMC0sAEQom+pxlPWBef1F5fNTxnE4Qx zwJlBn/tUhl1Sj1+Sly1G07oV+QTKthIoM= X-Received: by 2002:a05:600c:6297:b0:486:d76c:fa57 with SMTP id 5b1f17b1804b1-488fb77155dmr40662045e9.17.1776431488705; Fri, 17 Apr 2026 06:11:28 -0700 (PDT) Received: from localhost (p200300f65f20eb08db61cfc60d8aa232.dip0.t-ipconnect.de. [2003:f6:5f20:eb08:db61:cfc6:d8a:a232]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-488fc10019bsm47077255e9.4.2026.04.17.06.11.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Apr 2026 06:11:28 -0700 (PDT) From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20=28The=20Capable=20Hub=29?= To: Marcel Holtmann , Luiz Augusto von Dentz , Matthias Brugger , AngeloGioacchino Del Regno Cc: "Christian A. Ehrhardt" , linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH v1 3/6] Bluetooth: btmtksdio: Make use of driver data pointer in sdio_device_id Date: Fri, 17 Apr 2026 15:10:49 +0200 Message-ID: <06f26b3e090ea52c7a2620759e91511570404ec4.1776429984.git.u.kleine-koenig@baylibre.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: References: 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=1468; i=u.kleine-koenig@baylibre.com; h=from:subject:message-id; bh=2l6+VruZCe2G92lMFTOG+EfNer+jq/4dC3nqnXbD9Bs=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBp4jFefmfBzsGZ3kLo9zeNLh94uuX0wHZ82YrGA IzIlV9GZuaJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCaeIxXgAKCRCPgPtYfRL+ TqVpCACTT3vbVLQ2hxvR192QyFytoivzueoZDb7jatdZDvJrGkXY/SJpKAnv9gc7tTavtwOYXhV L7rr9SxPzSvrm3zD+tvpqyfbLoKqfGvY3AVSSl8244v/FpXMDNxScKr3vYhEkizGEik/1XdcnB3 AW8x/CqjVCy9e75Lwpx8EInxLRJZEbAfqaiX0exiAd+fe+EndihAzVbnujmTdKL8ma/h+gLj0eB mG3HY/e/6niSjndyNC/AvCXSlLgv3xR9Eg2yeDtxVe1/blvgFVPWaTjeUsEueV8dDHxLhU+f7vs T09dLoBa8K/yteXcNJ/kWIajTt4k3fRJTctpa2WxJWDTRszg X-Developer-Key: i=u.kleine-koenig@baylibre.com; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: quoted-printable Recently struct sdio_device_id gained a new member to store a pointer to driver data. Make use of that to get rid of a bunch of casts. Signed-off-by: Uwe Kleine-K=C3=B6nig (The Capable Hub) --- drivers/bluetooth/btmtksdio.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/bluetooth/btmtksdio.c b/drivers/bluetooth/btmtksdio.c index e986e5af51ae..ee886dcada63 100644 --- a/drivers/bluetooth/btmtksdio.c +++ b/drivers/bluetooth/btmtksdio.c @@ -64,11 +64,11 @@ static const struct btmtksdio_data mt7921_data =3D { =20 static const struct sdio_device_id btmtksdio_table[] =3D { {SDIO_DEVICE(SDIO_VENDOR_ID_MEDIATEK, SDIO_DEVICE_ID_MEDIATEK_MT7663), - .driver_data =3D (kernel_ulong_t)&mt7663_data }, + .driver_data_ptr =3D &mt7663_data }, {SDIO_DEVICE(SDIO_VENDOR_ID_MEDIATEK, SDIO_DEVICE_ID_MEDIATEK_MT7668), - .driver_data =3D (kernel_ulong_t)&mt7668_data }, + .driver_data_ptr =3D &mt7668_data }, {SDIO_DEVICE(SDIO_VENDOR_ID_MEDIATEK, SDIO_DEVICE_ID_MEDIATEK_MT7961), - .driver_data =3D (kernel_ulong_t)&mt7921_data }, + .driver_data_ptr =3D &mt7921_data }, { } /* Terminating entry */ }; MODULE_DEVICE_TABLE(sdio, btmtksdio_table); @@ -1352,7 +1352,7 @@ static int btmtksdio_probe(struct sdio_func *func, if (!bdev) return -ENOMEM; =20 - bdev->data =3D (void *)id->driver_data; + bdev->data =3D id->driver_data_ptr; if (!bdev->data) return -ENODEV; =20 --=20 2.47.3 From nobody Tue Jun 16 08:55:37 2026 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (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 B84513AB297 for ; Fri, 17 Apr 2026 13:11:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776431494; cv=none; b=SA2/jbHNQkdTFqZTGt7eXSJMUkbycFx+zgDHXV/sZLfYt24tThmS8PIqXcFnQCTfY2mve6svFuNlXxh97jX+8mqDcoXBa6ff3z7C1+TiJBYDWBJJKT9UQrmqZQ36bYGx+ez/ZWSQ1s1kage7Xx1z4YlcaogwPswM609t0RJYjdA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776431494; c=relaxed/simple; bh=4L2vpwuwg5+ZoVv8BbyxcrgDvBKdVsNcYCWmNsvZZXY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=HEZnyCFl/JmRcXFygE4Oon2pMHKojNztTInMO80oVJp+2SIkpu4ALVi6TisLEfmodvkKIcWYql148nQBrTYjDMZSEdrc8oWQS3nq36JYUCGfNmbqsuUuc6CPubTSAs3AV2tOiWqpewu1z1flf8DXOEE9NvzAVV3MlMpehZDeE+8= 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.20251104.gappssmtp.com header.i=@baylibre-com.20251104.gappssmtp.com header.b=MsBVlhNF; arc=none smtp.client-ip=209.85.221.41 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.20251104.gappssmtp.com header.i=@baylibre-com.20251104.gappssmtp.com header.b="MsBVlhNF" Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-43cf8d550bdso650460f8f.0 for ; Fri, 17 Apr 2026 06:11:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20251104.gappssmtp.com; s=20251104; t=1776431490; x=1777036290; 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=x3QUZ/jlQvGQi3TuVUmjigtPfN9idBRKMmXw1pwrDWs=; b=MsBVlhNFLAWaSubnYdxk2GObt6HWxD5EraVq/uWJte1iy5dmC25Ss5W57r90mXITzw JRh+F5A8fUSPld7y9yg0LAD/9gqH8iJN4tWjbVDCq99WPh/To4sSUwtCp5ETeSpqHBIs 6d4FzGjqoONvUxQZxZ8S5o7ZyMEGtJJfgnfenibFVlJfVYi9uiLx/Mr2zNWW6amznzRq ZQsKJzf7zgfbDGqFxzQO7MmQX39BlDFrmUQ0m9sJedlc3sytzjUm/aGov33Nm2JQyKOU Ul36wgIlDTXIOXMdPRfXBUsMjySA3+wcEOF04RKQqF61p7HwyVxIEtbPaOLS3cJUfQUt gCuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776431490; x=1777036290; 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=x3QUZ/jlQvGQi3TuVUmjigtPfN9idBRKMmXw1pwrDWs=; b=PTGk03D/kKWWFFnvG9+dQo/LFDDEWT0cUHNM8L7iXWts5in1Ep86ghQI1G8ZQ4alz3 XJmKakDw6B8UFQKkhj/TVZFtxHhhKL0i7rE0bomXXe286e2XmF2oBnKS96J+We7M5Ovy HSq+vJKjsLA1ihLDjLho9fFaw//heLbmShABnia2x17hKc2Vxg8usn11A4UAS9+gKj16 v9o/6YPmZd9wc3RU2kNyv9F+jYFBqrSLidKJVZ8HUDOE9n/kckrUQVg3HGE5Z7JGN1CY Nd6VeiLK3gm/t/so27qyZSjP9ryPCybdtkIhdsRxbrv4g+ENq7nyuAMf4vLL9uU3bMDZ GJ4g== X-Forwarded-Encrypted: i=1; AFNElJ8G6LyriG2cuxSCixRgNu6kVsh/iEwhuSza+1o7KrkOZH86cI7oVaVwB1gmW4Ecu///6qvKvqwJ4qKBLlA=@vger.kernel.org X-Gm-Message-State: AOJu0YxOA4Xfg8ENukDJfHW5L0MtlZYv2JJKUGKK5LqNv+4mPuLMQ8/F xPKe4JL6qk+Vf+G94mDDQYQgGA7ILKAUcGLU3f1PRXbAI/jUfpvPOIabb6EbHqkitd1n1IyNMzz UQsi3 X-Gm-Gg: AeBDietzYVAbQkT7CclOlbvqo5FbDxNZd7r3b76+tQ+NmMbWislUhMpn7c3fhmnqFTt PVGwwnubTlHc35qf+w8fnpxkZquRB8u4w1HFa7vEzhufRRJd/O0jaQ1weZkHIvmd4Uwr9+jBK7C 5+W3wBHEytcNjQJbSma5H0Ov+oGnV5r9pu9YwG0NS4I9jON9D4X98gINsPbNqQlymr9HYUX8+dA m6SSDkpwRuSrqqcS4QP1dTMT11PSVf7Qt4qrfvNfiu5YtIITnXZ+IT+gSAoLp4MHomGc8RNcOw0 rV23Ji75pS7DDBrFI5vsjUiCTesj4hzZWc1Y39jbIBWWVEapry3PGfpk3c7h56CLya5AXRRXlNz SFdg94fMyUTp7ZUe1ra0bqGlJoKCF5ymgmTeTHWzcGVNj9LAGLHlJVrp81SnsQqwKAHRPRfjQiy n0MJH4GyNH4GHOq/oZX+dk/1ZyK1VxAhn73iih+66Ayum9c/9KZsnbbEJV5FX9WL8sK+u6Vbt2B tmjAazsoWaBtMABWYkYfht79kfTrAquu6I= X-Received: by 2002:a05:6000:4201:b0:43f:e7fa:a6f1 with SMTP id ffacd0b85a97d-43fe7faa7admr1780435f8f.24.1776431490120; Fri, 17 Apr 2026 06:11:30 -0700 (PDT) Received: from localhost (p200300f65f20eb08db61cfc60d8aa232.dip0.t-ipconnect.de. [2003:f6:5f20:eb08:db61:cfc6:d8a:a232]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-43fe4dc24cfsm4613648f8f.16.2026.04.17.06.11.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Apr 2026 06:11:29 -0700 (PDT) From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20=28The=20Capable=20Hub=29?= To: Ping-Ke Shih Cc: "Christian A. Ehrhardt" , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 4/6] wifi: rtw88: Benefit from sdio_device_id::driver_data_ptr Date: Fri, 17 Apr 2026 15:10:50 +0200 Message-ID: X-Mailer: git-send-email 2.47.3 In-Reply-To: References: 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=4107; i=u.kleine-koenig@baylibre.com; h=from:subject:message-id; bh=4L2vpwuwg5+ZoVv8BbyxcrgDvBKdVsNcYCWmNsvZZXY=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBp4jFhaIU+uhdPpMFbsoO1FjHc7Ers/Y/bIwBlb OCMCyAz3aaJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCaeIxYQAKCRCPgPtYfRL+ ToSTCACrNjSx5dPN6SYUCLXu7uarnUutY0MJqTE7Dc5ISaEQVu1OwrK3ay61ZPJRr6+Ck3CMXt2 I9wGBqgwOv0U09IZwLYsJ0UuQgtJS4Lf2IhRIWBuqrwWxlk+Hg9cwpzd/mpCeqc7EWQ8V5Sjbnv 7lwsvOuQ/xRPblt36kxRo8Im/R6rXuNYDQBFZvoehOSKDZfU39sWz+lvA3LuawhWZzapOTScqPO l5yPD4ydBOtQr56FyEBvsJPiGQpK+ruJNvYa+NsIwqTyfFxs2Mh/DeyMiiuyIGu5ZKxsx3WlNoj PsYnBFjV/ozLQ/9/NSys36O3NsxTagBLh0MzXiDKr1NUxQiG X-Developer-Key: i=u.kleine-koenig@baylibre.com; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: quoted-printable Recently struct sdio_device_id gained a new member to store a pointer to driver data. Make use of that to get rid of a bunch of casts. Signed-off-by: Uwe Kleine-K=C3=B6nig (The Capable Hub) Acked-by: Ping-Ke Shih --- drivers/net/wireless/realtek/rtw88/rtw8723cs.c | 2 +- drivers/net/wireless/realtek/rtw88/rtw8723ds.c | 4 ++-- drivers/net/wireless/realtek/rtw88/rtw8821cs.c | 2 +- drivers/net/wireless/realtek/rtw88/rtw8822bs.c | 2 +- drivers/net/wireless/realtek/rtw88/rtw8822cs.c | 2 +- drivers/net/wireless/realtek/rtw88/sdio.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw88/rtw8723cs.c b/drivers/net/w= ireless/realtek/rtw88/rtw8723cs.c index 2018c9d76dd1..dbe2ba989160 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8723cs.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8723cs.c @@ -12,7 +12,7 @@ static const struct sdio_device_id rtw_8723cs_id_table[] = =3D { { SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK, SDIO_DEVICE_ID_REALTEK_RTW8723CS), - .driver_data =3D (kernel_ulong_t)&rtw8703b_hw_spec, + .driver_data_ptr =3D &rtw8703b_hw_spec, }, {} }; diff --git a/drivers/net/wireless/realtek/rtw88/rtw8723ds.c b/drivers/net/w= ireless/realtek/rtw88/rtw8723ds.c index e38c90b769a2..2d1872c97e30 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8723ds.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8723ds.c @@ -13,12 +13,12 @@ static const struct sdio_device_id rtw_8723ds_id_table[= ] =3D { { SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK, SDIO_DEVICE_ID_REALTEK_RTW8723DS_1ANT), - .driver_data =3D (kernel_ulong_t)&rtw8723d_hw_spec, + .driver_data_ptr =3D &rtw8723d_hw_spec, }, { SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK, SDIO_DEVICE_ID_REALTEK_RTW8723DS_2ANT), - .driver_data =3D (kernel_ulong_t)&rtw8723d_hw_spec, + .driver_data_ptr =3D &rtw8723d_hw_spec, }, {} }; diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821cs.c b/drivers/net/w= ireless/realtek/rtw88/rtw8821cs.c index 58e0ef219cdc..7fb2d892e52d 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8821cs.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8821cs.c @@ -13,7 +13,7 @@ static const struct sdio_device_id rtw_8821cs_id_table[] = =3D { { SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK, SDIO_DEVICE_ID_REALTEK_RTW8821CS), - .driver_data =3D (kernel_ulong_t)&rtw8821c_hw_spec, + .driver_data_ptr =3D &rtw8821c_hw_spec, }, {} }; diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822bs.c b/drivers/net/w= ireless/realtek/rtw88/rtw8822bs.c index 2de9b11540c5..08ae86e7ccbc 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8822bs.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8822bs.c @@ -13,7 +13,7 @@ static const struct sdio_device_id rtw_8822bs_id_table[] = =3D { { SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK, SDIO_DEVICE_ID_REALTEK_RTW8822BS), - .driver_data =3D (kernel_ulong_t)&rtw8822b_hw_spec, + .driver_data_ptr =3D &rtw8822b_hw_spec, }, {} }; diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822cs.c b/drivers/net/w= ireless/realtek/rtw88/rtw8822cs.c index b00ef4173962..9a6124ea2afc 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8822cs.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8822cs.c @@ -13,7 +13,7 @@ static const struct sdio_device_id rtw_8822cs_id_table[] = =3D { { SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK, SDIO_DEVICE_ID_REALTEK_RTW8822CS), - .driver_data =3D (kernel_ulong_t)&rtw8822c_hw_spec, + .driver_data_ptr =3D &rtw8822c_hw_spec, }, {} }; diff --git a/drivers/net/wireless/realtek/rtw88/sdio.c b/drivers/net/wirele= ss/realtek/rtw88/sdio.c index 1318e94f8524..f444a8f5902d 100644 --- a/drivers/net/wireless/realtek/rtw88/sdio.c +++ b/drivers/net/wireless/realtek/rtw88/sdio.c @@ -1334,7 +1334,7 @@ int rtw_sdio_probe(struct sdio_func *sdio_func, rtwdev =3D hw->priv; rtwdev->hw =3D hw; rtwdev->dev =3D &sdio_func->dev; - rtwdev->chip =3D (struct rtw_chip_info *)id->driver_data; + rtwdev->chip =3D id->driver_data_ptr; rtwdev->hci.ops =3D &rtw_sdio_ops; rtwdev->hci.type =3D RTW_HCI_TYPE_SDIO; =20 --=20 2.47.3 From nobody Tue Jun 16 08:55:37 2026 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (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 3BFC33B2FD4 for ; Fri, 17 Apr 2026 13:11:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776431494; cv=none; b=qIhgLx3fEAgtgtu+R//wRvCbqxAzlEZxLCypoafJvU3QWLMwQWt86j+83Dw7ZU3StHBgEoWCgAehQSU8WbgiKhl3eHlDwbVFPGnmXcO1Zf5Q7iVZZ3JP8OrAdvwThqp6Qh4KX5Onvesj2ccgqo8LF9XhesB2YG733LBp5FGhgN4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776431494; c=relaxed/simple; bh=99pqrTeNKVIGhX8X08ShNnx6aTU/lVS+ge4kgGBnY5s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=DoDbXLFug5UCL/5iODl0zkB8YT1gYD8YxaKhyBNwX5OFKxNW/jjD1J42ilsarhXWQQDgM4Kdw7K4HcXuYdpF438VI72QMb3uYZNgekb2iSVOtBUKBB7ItJs861aUGAdCZYpxAJS+qHsgASyTr/o84tADXPkH3y6z1+5MRAtJGXY= 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.20251104.gappssmtp.com header.i=@baylibre-com.20251104.gappssmtp.com header.b=cSYS4Lk3; arc=none smtp.client-ip=209.85.128.44 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.20251104.gappssmtp.com header.i=@baylibre-com.20251104.gappssmtp.com header.b="cSYS4Lk3" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-488971db0fdso7337135e9.0 for ; Fri, 17 Apr 2026 06:11:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20251104.gappssmtp.com; s=20251104; t=1776431492; x=1777036292; 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=4QkS3sLAmP1yQm4RdEvs3fVFr4UG0LEkh3x6qqTYVOk=; b=cSYS4Lk3lU5D+TFPsZpcrlzjYHoDRuQjQhOlef6IvbIS7pRRCmZ23ZES4wVQzYmGUw 7gZbZDSocymG+Vvad7rxziFofEclSD3uVkZQDP2MZHZazMX6nvciaHiv6b4mT3rck71P 7pSkwYF0wX3tEBxCwt5MFJYtHifWpqPgo8K8ua6Z1dvudrmauYfaoK2wp21jL6/sm1MY YCWOp7tMFT+pLvnMiwUZq2OX7KUWgfjzbUMzsqKWd1IMGoMYpiMQFOUANpCJt7FoZu2G THTYR+JKeus/LzChkN921ouAbWWYAmkZN/OuGxYzdxKWR7EUCGh3Gq8zTOwg62/J4Ycb J4wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776431492; x=1777036292; 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=4QkS3sLAmP1yQm4RdEvs3fVFr4UG0LEkh3x6qqTYVOk=; b=dc3i7BsaPhrFVZXSje806UByx5pYBQJdh7bPBG3dVqZ7uu1vBBYLEWXzEyhyERLK07 ySohsBM8tRlpjGwlpFnzGrgY2DiGDGHuGaKBWU73/K2hByJQGvHhXw9yJYp9T4qievIu YQo+A70zGvK4A88IMVF5/scHBUkUOg+eQfqcFEa9xz053QxxzhZTxNb31VIEEVdbq0th sQqCssl0Y3TxLwpO7nfSbBTV2tZ5r/z6Q9ZROtU1g60s5h2nGO73IygAu7mP79oEeJbf B6zVKMB1xBtb7b0CyMG4ltYEkXTt5AReVq7gtGi9piZeSKs+7hc+KfB+fnnvdrO2HM8k fyiQ== X-Forwarded-Encrypted: i=1; AFNElJ+oF+fU3cewEkj3AeJ2Lrimv3thWKa3ZMgDN/CBgMCqb5a8evGE3QWPahUG57ow9LoaUUegxsMbY/peAlY=@vger.kernel.org X-Gm-Message-State: AOJu0Yww/OsJt8XpJ0juzjkTqZeOZukIpdu+KefSmW6Jn/RSR9U3OCln 1T1jXdzHB50i4Q5J3C9+/VTMzIHXmaqIKWeGrJdupggPVm1rsg/PXrGTBuYz1uCa7pg= X-Gm-Gg: AeBDievQLUOetq6EBc9y3ycHEQ1T60QtjgKJ8vQYcxKdgV+9f5F3G9nUydT1FIYgtmz FlGm+ijIE7wRJDh9bUDDGxN1JYR3KP4G0kf2heL72onnF7ExC/KJZ87kAvokCyeVB1MqSIQYPJF 6vL/I/J40FxtPJbK+cWCCPZWMT2T3CoDLluK2q+l7wi0BGMAGOnrocmRI4aJC+itiPJnkH4Etg7 mdHFTRnzFFjT/eVsytMf2BweImDQrjGZGvLZLUND60LKzlZ95D9Vz1ra/jdJOOkVR/84gUfszrx oEIQeCP97tNFrY7JNxbXFA/MnuZBqiiRJuGh2iMxpYCGqDLMFsAEAjrrqXFEd7l24z5ZseP37FP rX+ZJtY5rFZ952S2vWURnjKT4WQ0jLKjhunPdzWPetYrguy4TrRlaWdjZdlag1ftovNoMhwWehc tnlLZvpC0pAkYR5wZqKBNHeTGrAOYoI7srxHjj8o2FbOd2Y6GeMQiUiFcyE14sG73fG+1mEpg0C RUmoMuCTKmzoMfZ5aHbfcDMayle9DomqsQ= X-Received: by 2002:a05:600c:c090:b0:488:9e54:94c0 with SMTP id 5b1f17b1804b1-488fb74e130mr29074175e9.8.1776431491453; Fri, 17 Apr 2026 06:11:31 -0700 (PDT) Received: from localhost (p200300f65f20eb08db61cfc60d8aa232.dip0.t-ipconnect.de. [2003:f6:5f20:eb08:db61:cfc6:d8a:a232]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-488fb75af76sm16948365e9.13.2026.04.17.06.11.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Apr 2026 06:11:31 -0700 (PDT) From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20=28The=20Capable=20Hub=29?= To: Felix Fietkau , Lorenzo Bianconi , Ryder Lee , Matthias Brugger , AngeloGioacchino Del Regno Cc: "Christian A. Ehrhardt" , Shayne Chen , Sean Wang , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH v1 5/6] wifi: mt76: mt7921-sdio: Make use of driver data pointer in sdio_device_id Date: Fri, 17 Apr 2026 15:10:51 +0200 Message-ID: X-Mailer: git-send-email 2.47.3 In-Reply-To: References: 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=2715; i=u.kleine-koenig@baylibre.com; h=from:subject:message-id; bh=99pqrTeNKVIGhX8X08ShNnx6aTU/lVS+ge4kgGBnY5s=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBp4jFjhPgBeIjDZSAgsGrUVzIaAF/51tn611lA9 289Fe0ABRSJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCaeIxYwAKCRCPgPtYfRL+ TtocCACiFjo/eQXQbwFRG2rY8GPBYwH48Wp024nyRoqStITAWsFQz3AVUa4pD9Peymq+C1E3gqo 9EOZgF9UlMBfXt0268RDR03XVaqnkyzqRMneyxxRDbBs9zAq+q42ZMOdc/13Djg10kLb1I7TpZT 28N0AoNRk5EIoEs5Fm7cjjWC4I7YoYYvUOADvK4Oc1GPoeKf/UFyom6VNqlRTykoWb3UTFNZq3G QqbLaTKbdIE+jor5zs87/HY0geFwlP1w4jGSp/S16eW8H57HQ8lcV05kjYnfKSrVHh3JbDnzr4H WmfbEqU44OJX4RZjn8ofHu6GxEsbWGVHAMc+dpLQSiZ5UHyB X-Developer-Key: i=u.kleine-koenig@baylibre.com; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: quoted-printable Recently struct sdio_device_id gained a new member to store a pointer to driver data. Make use of that to get rid of a bunch of casts. The pointer is declared as const, which requires the addition of another const for mt792x_get_mac80211_ops() to make the compiler happy which is a nice side effect. Signed-off-by: Uwe Kleine-K=C3=B6nig (The Capable Hub) --- drivers/net/wireless/mediatek/mt76/mt7921/sdio.c | 4 ++-- drivers/net/wireless/mediatek/mt76/mt792x.h | 2 +- drivers/net/wireless/mediatek/mt76/mt792x_core.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c b/drivers/net= /wireless/mediatek/mt76/mt7921/sdio.c index 3421e53dc948..284529fe6282 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c @@ -18,7 +18,7 @@ =20 static const struct sdio_device_id mt7921s_table[] =3D { { SDIO_DEVICE(SDIO_VENDOR_ID_MEDIATEK, 0x7901), - .driver_data =3D (kernel_ulong_t)MT7921_FIRMWARE_WM }, + .driver_data_ptr =3D MT7921_FIRMWARE_WM }, { } /* Terminating entry */ }; =20 @@ -129,7 +129,7 @@ static int mt7921s_probe(struct sdio_func *func, int ret; =20 ops =3D mt792x_get_mac80211_ops(&func->dev, &mt7921_ops, - (void *)id->driver_data, &features); + id->driver_data_ptr, &features); if (!ops) return -ENOMEM; =20 diff --git a/drivers/net/wireless/mediatek/mt76/mt792x.h b/drivers/net/wire= less/mediatek/mt76/mt792x.h index 8388638ed550..51c36ef4084e 100644 --- a/drivers/net/wireless/mediatek/mt76/mt792x.h +++ b/drivers/net/wireless/mediatek/mt76/mt792x.h @@ -436,7 +436,7 @@ int mt792x_init_wiphy(struct ieee80211_hw *hw); struct ieee80211_ops * mt792x_get_mac80211_ops(struct device *dev, const struct ieee80211_ops *mac80211_ops, - void *drv_data, u8 *fw_features); + const void *drv_data, u8 *fw_features); int mt792x_init_wcid(struct mt792x_dev *dev); int mt792x_mcu_drv_pmctrl(struct mt792x_dev *dev); int mt792x_mcu_fw_pmctrl(struct mt792x_dev *dev); diff --git a/drivers/net/wireless/mediatek/mt76/mt792x_core.c b/drivers/net= /wireless/mediatek/mt76/mt792x_core.c index f2ed16feb6c1..b92bae3f2151 100644 --- a/drivers/net/wireless/mediatek/mt76/mt792x_core.c +++ b/drivers/net/wireless/mediatek/mt76/mt792x_core.c @@ -763,7 +763,7 @@ mt792x_get_offload_capability(struct device *dev, const= char *fw_wm) struct ieee80211_ops * mt792x_get_mac80211_ops(struct device *dev, const struct ieee80211_ops *mac80211_ops, - void *drv_data, u8 *fw_features) + const void *drv_data, u8 *fw_features) { struct ieee80211_ops *ops; =20 --=20 2.47.3 From nobody Tue Jun 16 08:55:38 2026 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (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 8CB413B3BF9 for ; Fri, 17 Apr 2026 13:11:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776431496; cv=none; b=S1XGJGho3rfxsSWVod6PKIQF6Lh12DaMEZAwd1yojFdzWuuB4tCBaxcqrQIZzYfgbRvHUGci6pgyTSPkOUIUebDOrZD16dUNlxeoXEUPdFnwmi48rTMNDaKlUcxnjpePw5erNjYRPHPVHFYUVmblcuSKDhbsdNEAfbH+YNJr6Tc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776431496; c=relaxed/simple; bh=g/o2zj1w35MZdVu49VPAZd9P95ygaOzBdtAfyUfCa+g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=X6JbwRJvDeaNxD401q7sz1Y/d2uBccb50lePUBqYbrRYv+XqMFD3F/jsjVX7OmXX2OP6kT8QUTEbOwSyt7w5dtUSewlGueT5ZcNEzlyXi01Wl95BAaNXNP80JOPST693chsxIr7fLGIylLG43Tka97ektIZCW51pHQqeqe6JOyA= 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.20251104.gappssmtp.com header.i=@baylibre-com.20251104.gappssmtp.com header.b=Dndwzmpy; arc=none smtp.client-ip=209.85.128.44 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.20251104.gappssmtp.com header.i=@baylibre-com.20251104.gappssmtp.com header.b="Dndwzmpy" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-488e1a8ac40so9319075e9.2 for ; Fri, 17 Apr 2026 06:11:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20251104.gappssmtp.com; s=20251104; t=1776431493; x=1777036293; 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=U1dN0O/j7EE1Y0u7otXXkk+s6loIuCLpRRFSoniAyZ0=; b=DndwzmpytlSY0dcC/LWJXaDBlfcAw8XxW4mw6FUHyWvzEJt+B9RGqk5LFfISg8fG2O jaw4gz0ySfpa5grj0UptLLRSTtOEQhG3CdiEC/4KJ22uuH6g3C8wMackqnj14czB7Ckc uZEpZtTH7mZJ9Abmm+XApaySSZQQKWADe9c+dfNdheB61UmHecbrK5dTI5EP5jvVzNGg UGKE5/oobD01R2pcPjA6Xn7oYf76t4ZBqsiDrAfNrRNT/ez7wgEpdL14LGKIy6g02zTw HxIasGFcXsiCtS/NvdhhOEwyC5k1LC/eO9dNp434K2jtGEUapR8GH3pVRwH/FbFjW89r JmYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776431493; x=1777036293; 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=U1dN0O/j7EE1Y0u7otXXkk+s6loIuCLpRRFSoniAyZ0=; b=dxsZhChFDqEP3osU7We9h4SIU9RHlWq9FZwNFcIFn2/AZFub6CNctSdv53kXPaKJZE hossN0Ana5R13sIxZVGV7+FotFNS70aBP2NeDuDdh2G/ZIcmXdIsyQv25/F83n9IP+0y MDYJCfWIkY7oP83BTZA+EmdsQ/MQagsiDQuhmvC9qqlcRFQYx6qQWCS6iQxmZIi/qhJ5 d9pQC7cptOUnmevVQcEWXPf31teIitPuBT1ogMXWnz2g65P+6nFasbOtpeKs9eJKYb/F 7mWLYf1o01TutCiTaq4hzoGdQ3RZLm3iFAFDYgUxQLGYweRR38C6q+XsXDQMSuS7CEXX GdUg== X-Forwarded-Encrypted: i=1; AFNElJ9xALnklzgzQJHBkyGjJAvLMUphnT/HDX5LcEPwDxQkf6A1+P6NOF9ERmCSmZhbWyH/2IFO2l32+v6/tDM=@vger.kernel.org X-Gm-Message-State: AOJu0Yx+Jt1XauWMZcE6jx1/oc+EPElJqtzTvbYNUoCGiJYMrJ6bCmik FcBG3dBKqvGGqZ3tPvlpVYRMD5c2ozhIdr1JcteBWmDWnYhDxDGJQn0p1NtwWjfUAh4= X-Gm-Gg: AeBDievBVy8i0hK3cCMMb80sMtUycfWhjSayvf81N8tVyq4J1Dug1+41dxdrwdBX8F7 LHdJWFxOCAvSIJ7XtZYjkhHllYmH28xOr/A7qlk3XMVpbs64B10E6mw7d3HxzTMkfbo5e3BJLOX 6bRX6/vF4shAvNfnnuEUiTreqZpg3I1kaRLxi2EcB3+p/chvYTB9gNS0LMhjQEcOlHrgJXT6MGu 8YCgu0kULMMLg2rPtGGSU9HHYiKlNED72HguHclIpmyDxShrGRhjGlZHxCCERnldLdXQDGbiUVH IlCdJmGTnJ/gjGDqxiZaw71WwEHoDZ4tsMOhhb1/evxa8xJ6erfnH05gdpHTZcWRdFjKjAZkW6p KPABv7vwA+e6T0sopm6vf52HEREam2ReHAZOQ7BSlw2cGICgyUYQ5gyk04sTNlY8IjmVE76TFu7 YbrB2KcKq5Y7SZSh51zyr/7KS8NiHjqfPJT0A6fLuIksyPGt3c7VVrOEOHAip+YAvhie07+eLMC teDXJ1t+Oj+/z1nRrPJGJDz X-Received: by 2002:a05:600c:4750:b0:486:fdba:f5db with SMTP id 5b1f17b1804b1-488fb6e7316mr43903205e9.0.1776431492894; Fri, 17 Apr 2026 06:11:32 -0700 (PDT) Received: from localhost (p200300f65f20eb08db61cfc60d8aa232.dip0.t-ipconnect.de. [2003:f6:5f20:eb08:db61:cfc6:d8a:a232]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-488fc13938fsm64770235e9.10.2026.04.17.06.11.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Apr 2026 06:11:32 -0700 (PDT) From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20=28The=20Capable=20Hub=29?= To: Brian Norris Cc: "Christian A. Ehrhardt" , Francesco Dolcini , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 6/6] wifi: mwifiex: Make use of driver data pointer in sdio_device_id Date: Fri, 17 Apr 2026 15:10:52 +0200 Message-ID: <9dbbb7a9a8ad3a12d562b589a6756baf226d5dab.1776429984.git.u.kleine-koenig@baylibre.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: References: 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=3002; i=u.kleine-koenig@baylibre.com; h=from:subject:message-id; bh=g/o2zj1w35MZdVu49VPAZd9P95ygaOzBdtAfyUfCa+g=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBp4jFmf/dqoTuKLBG7njXHUAdWAWnJmQIyguFXU lTUdfcLs0SJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCaeIxZgAKCRCPgPtYfRL+ TmHGCACoRv8GMpdOUfeCIxEavNFBVl5AIT5f20krZNCiEfaFAsV9SDlTFGbtoelij6JpgeH1dBE h1y01y2BYHEZ/uYNAo2kiN/KY7T3x40lxoyckLweP9jzlLo1M/DxCnJNo7M061yLzvkUGy8dZP4 VEcSfZ7rK9lNh/iT8uyk25DmmSuAOvT+eNgEAOdV9yQxckkhEasTXt6LIaV7kSxAKM6hvuHrLut AuYXsqaXQFk5jDCviiDAmSzSWkkevyOtq7GbloInBeq6zuG3QIYuK4Wxxfm3yjffqd3luWwtIle 66L43JKtIc4wvfq0xYcIoVkRC2pcJYS984Tj38X92ONEn/ot X-Developer-Key: i=u.kleine-koenig@baylibre.com; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: quoted-printable Recently struct sdio_device_id gained a new member to store a pointer to driver data. Make use of that to get rid of a bunch of casts. Signed-off-by: Uwe Kleine-K=C3=B6nig (The Capable Hub) Acked-by: Brian Norris --- drivers/net/wireless/marvell/mwifiex/sdio.c | 24 ++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c b/drivers/net/wire= less/marvell/mwifiex/sdio.c index f039d6f19183..ea227f7685b8 100644 --- a/drivers/net/wireless/marvell/mwifiex/sdio.c +++ b/drivers/net/wireless/marvell/mwifiex/sdio.c @@ -566,8 +566,8 @@ mwifiex_sdio_probe(struct sdio_func *func, const struct= sdio_device_id *id) =20 func->card->quirks |=3D MMC_QUIRK_BLKSZ_FOR_BYTE_MODE; =20 - if (id->driver_data) { - struct mwifiex_sdio_device *data =3D (void *)id->driver_data; + if (id->driver_data_ptr) { + const struct mwifiex_sdio_device *data =3D id->driver_data_ptr; =20 card->firmware =3D data->firmware; card->firmware_sdiouart =3D data->firmware_sdiouart; @@ -955,25 +955,25 @@ static void mwifiex_sdio_coredump(struct device *dev) /* WLAN IDs */ static const struct sdio_device_id mwifiex_ids[] =3D { {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8786_WLAN), - .driver_data =3D (unsigned long) &mwifiex_sdio_sd8786}, + .driver_data_ptr =3D &mwifiex_sdio_sd8786}, {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8787_WLAN), - .driver_data =3D (unsigned long) &mwifiex_sdio_sd8787}, + .driver_data_ptr =3D &mwifiex_sdio_sd8787}, {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8797_WLAN), - .driver_data =3D (unsigned long) &mwifiex_sdio_sd8797}, + .driver_data_ptr =3D &mwifiex_sdio_sd8797}, {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8897_WLAN), - .driver_data =3D (unsigned long) &mwifiex_sdio_sd8897}, + .driver_data_ptr =3D &mwifiex_sdio_sd8897}, {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8887_WLAN), - .driver_data =3D (unsigned long)&mwifiex_sdio_sd8887}, + .driver_data_ptr =3D &mwifiex_sdio_sd8887}, {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8801_WLAN), - .driver_data =3D (unsigned long)&mwifiex_sdio_sd8801}, + .driver_data_ptr =3D &mwifiex_sdio_sd8801}, {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8977_WLAN), - .driver_data =3D (unsigned long)&mwifiex_sdio_sd8977}, + .driver_data_ptr =3D &mwifiex_sdio_sd8977}, {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8978_WLAN), - .driver_data =3D (unsigned long)&mwifiex_sdio_sd8978}, + .driver_data_ptr =3D &mwifiex_sdio_sd8978}, {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8987_WLAN), - .driver_data =3D (unsigned long)&mwifiex_sdio_sd8987}, + .driver_data_ptr =3D &mwifiex_sdio_sd8987}, {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8997_WLAN), - .driver_data =3D (unsigned long)&mwifiex_sdio_sd8997}, + .driver_data_ptr =3D &mwifiex_sdio_sd8997}, {}, }; =20 --=20 2.47.3