forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: wilc1000: wilc_handle_isr: add argument wilc to wilc_handle_isr

Browse source 
This patch add new argument wilc to wilc_handle_isr and pass wilc to
the function.
It is void type for now because wilc_wlan.c was implemented platform
independently at the beginning (linux_wlan.c is implementation of LINUX part),
so the header file which defines struct wilc cannot be included at this moment,
but this driver is dedicated to LINUX so wilc_wlan.c and linux_wlan.c will be
merged. After that, this void type will be changed with struct wilc as well as
other functions which are using void type in wilc_wlan.h.

Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Glen Lee 2015-10-27 18:27:40 +09:00 • committed by Greg Kroah-Hartman
parent ec5cc75061
commit 50b929e08e
4 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/staging/wilc1000/linux_wlan.c
View file

@ -261,7 +261,7 @@ irqreturn_t isr_bh_routine(int irq, void *userdata)
} }
PRINT_D(INT_DBG, "Interrupt received BH\n"); PRINT_D(INT_DBG, "Interrupt received BH\n");
wilc_handle_isr(); wilc_handle_isr(wilc);
return IRQ_HANDLED; return IRQ_HANDLED;
} }

7
drivers/staging/wilc1000/linux_wlan_sdio.c
View file

@ -27,7 +27,6 @@ struct wilc_sdio {
}; };
struct sdio_func *local_sdio_func; struct sdio_func *local_sdio_func;
extern void wilc_handle_isr(void);
static unsigned int sdio_default_speed; static unsigned int sdio_default_speed;
@ -42,9 +41,13 @@ static const struct sdio_device_id wilc_sdio_ids[] = {
static void wilc_sdio_interrupt(struct sdio_func *func) static void wilc_sdio_interrupt(struct sdio_func *func)
{ {
struct wilc_sdio *wl_sdio;
wl_sdio = sdio_get_drvdata(func);
#ifndef WILC_SDIO_IRQ_GPIO #ifndef WILC_SDIO_IRQ_GPIO
sdio_release_host(func); sdio_release_host(func);
wilc_handle_isr(); wilc_handle_isr(wl_sdio->wilc);
sdio_claim_host(func); sdio_claim_host(func);
#endif #endif
} }

2
drivers/staging/wilc1000/wilc_wlan.c
View file

@ -1353,7 +1353,7 @@ _end_:
wilc_wlan_handle_rxq(); wilc_wlan_handle_rxq();
} }
void wilc_handle_isr(void) void wilc_handle_isr(void *wilc)
{ {
u32 int_status; u32 int_status;

2
drivers/staging/wilc1000/wilc_wlan.h
View file

@ -301,7 +301,7 @@ int wilc_wlan_stop(void);
int wilc_wlan_txq_add_net_pkt(void *priv, u8 *buffer, u32 buffer_size, int wilc_wlan_txq_add_net_pkt(void *priv, u8 *buffer, u32 buffer_size,
wilc_tx_complete_func_t func); wilc_tx_complete_func_t func);
int wilc_wlan_handle_txq(u32 *pu32TxqCount); int wilc_wlan_handle_txq(u32 *pu32TxqCount);
void wilc_handle_isr(void); void wilc_handle_isr(void *wilc);
void wilc_wlan_cleanup(void); void wilc_wlan_cleanup(void);
int wilc_wlan_cfg_set(int start, u32 wid, u8 *buffer, u32 buffer_size, int wilc_wlan_cfg_set(int start, u32 wid, u8 *buffer, u32 buffer_size,
int commit, u32 drvHandler); int commit, u32 drvHandler);