Commit f9bf6e72 authored by Wu Yunchuan's avatar Wu Yunchuan Committed by Kalle Valo

wifi: rsi: rsi_91x_sdio: Remove unnecessary (void*) conversions

No need cast (void*) to (struct rsi_91x_sdiodev *).
Signed-off-by: default avatarWu Yunchuan <yunchuan@nfschina.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230803073539.3666735-1-yunchuan@nfschina.com
parent db2be1a0
...@@ -144,8 +144,7 @@ static int rsi_issue_sdiocommand(struct sdio_func *func, ...@@ -144,8 +144,7 @@ static int rsi_issue_sdiocommand(struct sdio_func *func,
static void rsi_handle_interrupt(struct sdio_func *function) static void rsi_handle_interrupt(struct sdio_func *function)
{ {
struct rsi_hw *adapter = sdio_get_drvdata(function); struct rsi_hw *adapter = sdio_get_drvdata(function);
struct rsi_91x_sdiodev *dev = struct rsi_91x_sdiodev *dev = adapter->rsi_dev;
(struct rsi_91x_sdiodev *)adapter->rsi_dev;
if (adapter->priv->fsm_state == FSM_FW_NOT_LOADED) if (adapter->priv->fsm_state == FSM_FW_NOT_LOADED)
return; return;
...@@ -337,8 +336,7 @@ static void rsi_reset_card(struct sdio_func *pfunction) ...@@ -337,8 +336,7 @@ static void rsi_reset_card(struct sdio_func *pfunction)
*/ */
static void rsi_setclock(struct rsi_hw *adapter, u32 freq) static void rsi_setclock(struct rsi_hw *adapter, u32 freq)
{ {
struct rsi_91x_sdiodev *dev = struct rsi_91x_sdiodev *dev = adapter->rsi_dev;
(struct rsi_91x_sdiodev *)adapter->rsi_dev;
struct mmc_host *host = dev->pfunction->card->host; struct mmc_host *host = dev->pfunction->card->host;
u32 clock; u32 clock;
...@@ -358,8 +356,7 @@ static void rsi_setclock(struct rsi_hw *adapter, u32 freq) ...@@ -358,8 +356,7 @@ static void rsi_setclock(struct rsi_hw *adapter, u32 freq)
*/ */
static int rsi_setblocklength(struct rsi_hw *adapter, u32 length) static int rsi_setblocklength(struct rsi_hw *adapter, u32 length)
{ {
struct rsi_91x_sdiodev *dev = struct rsi_91x_sdiodev *dev = adapter->rsi_dev;
(struct rsi_91x_sdiodev *)adapter->rsi_dev;
int status; int status;
rsi_dbg(INIT_ZONE, "%s: Setting the block length\n", __func__); rsi_dbg(INIT_ZONE, "%s: Setting the block length\n", __func__);
...@@ -380,8 +377,7 @@ static int rsi_setblocklength(struct rsi_hw *adapter, u32 length) ...@@ -380,8 +377,7 @@ static int rsi_setblocklength(struct rsi_hw *adapter, u32 length)
*/ */
static int rsi_setupcard(struct rsi_hw *adapter) static int rsi_setupcard(struct rsi_hw *adapter)
{ {
struct rsi_91x_sdiodev *dev = struct rsi_91x_sdiodev *dev = adapter->rsi_dev;
(struct rsi_91x_sdiodev *)adapter->rsi_dev;
int status = 0; int status = 0;
rsi_setclock(adapter, 50000); rsi_setclock(adapter, 50000);
...@@ -407,8 +403,7 @@ int rsi_sdio_read_register(struct rsi_hw *adapter, ...@@ -407,8 +403,7 @@ int rsi_sdio_read_register(struct rsi_hw *adapter,
u32 addr, u32 addr,
u8 *data) u8 *data)
{ {
struct rsi_91x_sdiodev *dev = struct rsi_91x_sdiodev *dev = adapter->rsi_dev;
(struct rsi_91x_sdiodev *)adapter->rsi_dev;
u8 fun_num = 0; u8 fun_num = 0;
int status; int status;
...@@ -441,8 +436,7 @@ int rsi_sdio_write_register(struct rsi_hw *adapter, ...@@ -441,8 +436,7 @@ int rsi_sdio_write_register(struct rsi_hw *adapter,
u32 addr, u32 addr,
u8 *data) u8 *data)
{ {
struct rsi_91x_sdiodev *dev = struct rsi_91x_sdiodev *dev = adapter->rsi_dev;
(struct rsi_91x_sdiodev *)adapter->rsi_dev;
int status = 0; int status = 0;
if (likely(dev->sdio_irq_task != current)) if (likely(dev->sdio_irq_task != current))
...@@ -495,8 +489,7 @@ static int rsi_sdio_read_register_multiple(struct rsi_hw *adapter, ...@@ -495,8 +489,7 @@ static int rsi_sdio_read_register_multiple(struct rsi_hw *adapter,
u8 *data, u8 *data,
u16 count) u16 count)
{ {
struct rsi_91x_sdiodev *dev = struct rsi_91x_sdiodev *dev = adapter->rsi_dev;
(struct rsi_91x_sdiodev *)adapter->rsi_dev;
u32 status; u32 status;
if (likely(dev->sdio_irq_task != current)) if (likely(dev->sdio_irq_task != current))
...@@ -527,8 +520,7 @@ int rsi_sdio_write_register_multiple(struct rsi_hw *adapter, ...@@ -527,8 +520,7 @@ int rsi_sdio_write_register_multiple(struct rsi_hw *adapter,
u8 *data, u8 *data,
u16 count) u16 count)
{ {
struct rsi_91x_sdiodev *dev = struct rsi_91x_sdiodev *dev = adapter->rsi_dev;
(struct rsi_91x_sdiodev *)adapter->rsi_dev;
int status; int status;
if (dev->write_fail > 1) { if (dev->write_fail > 1) {
...@@ -762,8 +754,7 @@ static int rsi_sdio_host_intf_write_pkt(struct rsi_hw *adapter, ...@@ -762,8 +754,7 @@ static int rsi_sdio_host_intf_write_pkt(struct rsi_hw *adapter,
u8 *pkt, u8 *pkt,
u32 len) u32 len)
{ {
struct rsi_91x_sdiodev *dev = struct rsi_91x_sdiodev *dev = adapter->rsi_dev;
(struct rsi_91x_sdiodev *)adapter->rsi_dev;
u32 block_size = dev->tx_blk_size; u32 block_size = dev->tx_blk_size;
u32 num_blocks, address, length; u32 num_blocks, address, length;
u32 queueno; u32 queueno;
...@@ -1045,7 +1036,7 @@ static int rsi_probe(struct sdio_func *pfunction, ...@@ -1045,7 +1036,7 @@ static int rsi_probe(struct sdio_func *pfunction,
goto fail_free_adapter; goto fail_free_adapter;
} }
sdev = (struct rsi_91x_sdiodev *)adapter->rsi_dev; sdev = adapter->rsi_dev;
rsi_init_event(&sdev->rx_thread.event); rsi_init_event(&sdev->rx_thread.event);
status = rsi_create_kthread(adapter->priv, &sdev->rx_thread, status = rsi_create_kthread(adapter->priv, &sdev->rx_thread,
rsi_sdio_rx_thread, "SDIO-RX-Thread"); rsi_sdio_rx_thread, "SDIO-RX-Thread");
...@@ -1221,7 +1212,7 @@ static void rsi_disconnect(struct sdio_func *pfunction) ...@@ -1221,7 +1212,7 @@ static void rsi_disconnect(struct sdio_func *pfunction)
if (!adapter) if (!adapter)
return; return;
dev = (struct rsi_91x_sdiodev *)adapter->rsi_dev; dev = adapter->rsi_dev;
rsi_kill_thread(&dev->rx_thread); rsi_kill_thread(&dev->rx_thread);
sdio_claim_host(pfunction); sdio_claim_host(pfunction);
...@@ -1255,8 +1246,7 @@ static void rsi_disconnect(struct sdio_func *pfunction) ...@@ -1255,8 +1246,7 @@ static void rsi_disconnect(struct sdio_func *pfunction)
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int rsi_set_sdio_pm_caps(struct rsi_hw *adapter) static int rsi_set_sdio_pm_caps(struct rsi_hw *adapter)
{ {
struct rsi_91x_sdiodev *dev = struct rsi_91x_sdiodev *dev = adapter->rsi_dev;
(struct rsi_91x_sdiodev *)adapter->rsi_dev;
struct sdio_func *func = dev->pfunction; struct sdio_func *func = dev->pfunction;
int ret; int ret;
...@@ -1407,7 +1397,7 @@ static int rsi_freeze(struct device *dev) ...@@ -1407,7 +1397,7 @@ static int rsi_freeze(struct device *dev)
return -ENODEV; return -ENODEV;
} }
common = adapter->priv; common = adapter->priv;
sdev = (struct rsi_91x_sdiodev *)adapter->rsi_dev; sdev = adapter->rsi_dev;
if ((common->wow_flags & RSI_WOW_ENABLED) && if ((common->wow_flags & RSI_WOW_ENABLED) &&
(common->wow_flags & RSI_WOW_NO_CONNECTION)) (common->wow_flags & RSI_WOW_NO_CONNECTION))
...@@ -1457,8 +1447,7 @@ static void rsi_shutdown(struct device *dev) ...@@ -1457,8 +1447,7 @@ static void rsi_shutdown(struct device *dev)
{ {
struct sdio_func *pfunction = dev_to_sdio_func(dev); struct sdio_func *pfunction = dev_to_sdio_func(dev);
struct rsi_hw *adapter = sdio_get_drvdata(pfunction); struct rsi_hw *adapter = sdio_get_drvdata(pfunction);
struct rsi_91x_sdiodev *sdev = struct rsi_91x_sdiodev *sdev = adapter->rsi_dev;
(struct rsi_91x_sdiodev *)adapter->rsi_dev;
struct ieee80211_hw *hw = adapter->hw; struct ieee80211_hw *hw = adapter->hw;
rsi_dbg(ERR_ZONE, "SDIO Bus shutdown =====>\n"); rsi_dbg(ERR_ZONE, "SDIO Bus shutdown =====>\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment