[PATCH v1 4/6] wifi: rtw88: Benefit from sdio_device_id::driver_data_ptr

[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/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/wireless/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[] = {
 	{
 		SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK,
 			    SDIO_DEVICE_ID_REALTEK_RTW8723CS),
-		.driver_data = (kernel_ulong_t)&rtw8703b_hw_spec,
+		.driver_data_ptr = &rtw8703b_hw_spec,
 	},
 	{}
 };
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8723ds.c b/drivers/net/wireless/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[] =  {
 	{
 		SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK,
 			    SDIO_DEVICE_ID_REALTEK_RTW8723DS_1ANT),
-		.driver_data = (kernel_ulong_t)&rtw8723d_hw_spec,
+		.driver_data_ptr = &rtw8723d_hw_spec,
 	},
 	{
 		SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK,
 			    SDIO_DEVICE_ID_REALTEK_RTW8723DS_2ANT),
-		.driver_data = (kernel_ulong_t)&rtw8723d_hw_spec,
+		.driver_data_ptr = &rtw8723d_hw_spec,
 	},
 	{}
 };
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821cs.c b/drivers/net/wireless/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[] =  {
 	{
 		SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK,
 			    SDIO_DEVICE_ID_REALTEK_RTW8821CS),
-		.driver_data = (kernel_ulong_t)&rtw8821c_hw_spec,
+		.driver_data_ptr = &rtw8821c_hw_spec,
 	},
 	{}
 };
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822bs.c b/drivers/net/wireless/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[] =  {
 	{
 		SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK,
 			    SDIO_DEVICE_ID_REALTEK_RTW8822BS),
-		.driver_data = (kernel_ulong_t)&rtw8822b_hw_spec,
+		.driver_data_ptr = &rtw8822b_hw_spec,
 	},
 	{}
 };
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822cs.c b/drivers/net/wireless/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[] =  {
 	{
 		SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK,
 			    SDIO_DEVICE_ID_REALTEK_RTW8822CS),
-		.driver_data = (kernel_ulong_t)&rtw8822c_hw_spec,
+		.driver_data_ptr = &rtw8822c_hw_spec,
 	},
 	{}
 };
diff --git a/drivers/net/wireless/realtek/rtw88/sdio.c b/drivers/net/wireless/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 = hw->priv;
 	rtwdev->hw = hw;
 	rtwdev->dev = &sdio_func->dev;
-	rtwdev->chip = (struct rtw_chip_info *)id->driver_data;
+	rtwdev->chip = id->driver_data_ptr;
 	rtwdev->hci.ops = &rtw_sdio_ops;
 	rtwdev->hci.type = RTW_HCI_TYPE_SDIO;
 
-- 
2.47.3