[PATCH v1 6/6] wifi: mwifiex: Make use of driver data pointer in sdio_device_id

[Uwe Kleine-König (The Capable Hub)]

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önig (The Capable Hub) <u.kleine-koenig@xxxxxxxxxxxx>
---
 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/wireless/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)
 
 	func->card->quirks |= MMC_QUIRK_BLKSZ_FOR_BYTE_MODE;
 
-	if (id->driver_data) {
-		struct mwifiex_sdio_device *data = (void *)id->driver_data;
+	if (id->driver_data_ptr) {
+		const struct mwifiex_sdio_device *data = id->driver_data_ptr;
 
 		card->firmware = data->firmware;
 		card->firmware_sdiouart = 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[] = {
 	{SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8786_WLAN),
-		.driver_data = (unsigned long) &mwifiex_sdio_sd8786},
+		.driver_data_ptr = &mwifiex_sdio_sd8786},
 	{SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8787_WLAN),
-		.driver_data = (unsigned long) &mwifiex_sdio_sd8787},
+		.driver_data_ptr = &mwifiex_sdio_sd8787},
 	{SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8797_WLAN),
-		.driver_data = (unsigned long) &mwifiex_sdio_sd8797},
+		.driver_data_ptr = &mwifiex_sdio_sd8797},
 	{SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8897_WLAN),
-		.driver_data = (unsigned long) &mwifiex_sdio_sd8897},
+		.driver_data_ptr = &mwifiex_sdio_sd8897},
 	{SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8887_WLAN),
-		.driver_data = (unsigned long)&mwifiex_sdio_sd8887},
+		.driver_data_ptr = &mwifiex_sdio_sd8887},
 	{SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8801_WLAN),
-		.driver_data = (unsigned long)&mwifiex_sdio_sd8801},
+		.driver_data_ptr = &mwifiex_sdio_sd8801},
 	{SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8977_WLAN),
-		.driver_data = (unsigned long)&mwifiex_sdio_sd8977},
+		.driver_data_ptr = &mwifiex_sdio_sd8977},
 	{SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8978_WLAN),
-		.driver_data = (unsigned long)&mwifiex_sdio_sd8978},
+		.driver_data_ptr = &mwifiex_sdio_sd8978},
 	{SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8987_WLAN),
-		.driver_data = (unsigned long)&mwifiex_sdio_sd8987},
+		.driver_data_ptr = &mwifiex_sdio_sd8987},
 	{SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8997_WLAN),
-		.driver_data = (unsigned long)&mwifiex_sdio_sd8997},
+		.driver_data_ptr = &mwifiex_sdio_sd8997},
 	{},
 };
 
-- 
2.47.3