diff mbox

[02/28] staging: wicl1000: isr_uh_routine: use netdev private wilc

Message ID 1445578124-31486-2-git-send-email-glen.lee@atmel.com (mailing list archive)
State Not Applicable
Delegated to: Kalle Valo
Headers show

Commit Message

Glen Lee Oct. 23, 2015, 5:28 a.m. UTC
Use netdev private member wilc instead of g_linux_wlan and Change argument wilc
with dev in the function request_threaded_irq to pass back to handler
the function isr_uh_routine.

Signed-off-by: Glen Lee <glen.lee@atmel.com>
---
 drivers/staging/wilc1000/linux_wlan.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Comments

Greg Kroah-Hartman Oct. 25, 2015, 1:29 a.m. UTC | #1
On Fri, Oct 23, 2015 at 02:28:18PM +0900, Glen Lee wrote:
> Use netdev private member wilc instead of g_linux_wlan and Change argument wilc
> with dev in the function request_threaded_irq to pass back to handler
> the function isr_uh_routine.
> 
> Signed-off-by: Glen Lee <glen.lee@atmel.com>
> ---
>  drivers/staging/wilc1000/linux_wlan.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
> index b036b96..7b0614d 100644
> --- a/drivers/staging/wilc1000/linux_wlan.c
> +++ b/drivers/staging/wilc1000/linux_wlan.c
> @@ -229,10 +229,15 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event
>  #if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO)
>  static irqreturn_t isr_uh_routine(int irq, void *user_data)
>  {
> +	perInterface_wlan_t *nic;
> +	struct wilc *wl;
> +
> +	nic = netdev_priv(usedata);

This patch breaks the build, which means you didn't even test build the
series :(

Please redo this whole series and test your patches better.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Glen Lee Oct. 26, 2015, 2:08 a.m. UTC | #2
On 2015? 10? 25? 10:29, Greg KH wrote:
> On Fri, Oct 23, 2015 at 02:28:18PM +0900, Glen Lee wrote:
>> Use netdev private member wilc instead of g_linux_wlan and Change argument wilc
>> with dev in the function request_threaded_irq to pass back to handler
>> the function isr_uh_routine.
>>
>> Signed-off-by: Glen Lee <glen.lee@atmel.com>
>> ---
>>   drivers/staging/wilc1000/linux_wlan.c | 9 +++++++--
>>   1 file changed, 7 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
>> index b036b96..7b0614d 100644
>> --- a/drivers/staging/wilc1000/linux_wlan.c
>> +++ b/drivers/staging/wilc1000/linux_wlan.c
>> @@ -229,10 +229,15 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event
>>   #if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO)
>>   static irqreturn_t isr_uh_routine(int irq, void *user_data)
>>   {
>> +	perInterface_wlan_t *nic;
>> +	struct wilc *wl;
>> +
>> +	nic = netdev_priv(usedata);
> This patch breaks the build, which means you didn't even test build the
> series :(

Hi greg,

I built every patches I'v posted and also there is no build error for this patch.
Would you please reconsider this patch again?

> Please redo this whole series and test your patches better.
>
> greg k-h

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Greg Kroah-Hartman Oct. 26, 2015, 8:23 a.m. UTC | #3
On Mon, Oct 26, 2015 at 11:08:43AM +0900, glen lee wrote:
> 
> 
> On 2015? 10? 25? 10:29, Greg KH wrote:
> >On Fri, Oct 23, 2015 at 02:28:18PM +0900, Glen Lee wrote:
> >>Use netdev private member wilc instead of g_linux_wlan and Change argument wilc
> >>with dev in the function request_threaded_irq to pass back to handler
> >>the function isr_uh_routine.
> >>
> >>Signed-off-by: Glen Lee <glen.lee@atmel.com>
> >>---
> >>  drivers/staging/wilc1000/linux_wlan.c | 9 +++++++--
> >>  1 file changed, 7 insertions(+), 2 deletions(-)
> >>
> >>diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
> >>index b036b96..7b0614d 100644
> >>--- a/drivers/staging/wilc1000/linux_wlan.c
> >>+++ b/drivers/staging/wilc1000/linux_wlan.c
> >>@@ -229,10 +229,15 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event
> >>  #if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO)
> >>  static irqreturn_t isr_uh_routine(int irq, void *user_data)
> >>  {
> >>+	perInterface_wlan_t *nic;
> >>+	struct wilc *wl;
> >>+
> >>+	nic = netdev_priv(usedata);
> >This patch breaks the build, which means you didn't even test build the
> >series :(
> 
> Hi greg,
> 
> I built every patches I'v posted and also there is no build error for this patch.

I don't believe you, just look at the lines, it's obviously incorrect.

> Would you please reconsider this patch again?

Why would I ever accept a patch that is obviously wrong?  I would be a
horrible subsystem maintainer, and you would not want me to merge an
obviously broken patch from someone else into this driver, breaking it,
right?

I have no idea why you would expect me to ever accept this patch as-is.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Glen Lee Oct. 26, 2015, 9:15 a.m. UTC | #4
On 2015? 10? 26? 17:23, Greg KH wrote:
> On Mon, Oct 26, 2015 at 11:08:43AM +0900, glen lee wrote:
>>
>> On 2015? 10? 25? 10:29, Greg KH wrote:
>>> On Fri, Oct 23, 2015 at 02:28:18PM +0900, Glen Lee wrote:
>>>> Use netdev private member wilc instead of g_linux_wlan and Change argument wilc
>>>> with dev in the function request_threaded_irq to pass back to handler
>>>> the function isr_uh_routine.
>>>>
>>>> Signed-off-by: Glen Lee <glen.lee@atmel.com>
>>>> ---
>>>>   drivers/staging/wilc1000/linux_wlan.c | 9 +++++++--
>>>>   1 file changed, 7 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
>>>> index b036b96..7b0614d 100644
>>>> --- a/drivers/staging/wilc1000/linux_wlan.c
>>>> +++ b/drivers/staging/wilc1000/linux_wlan.c
>>>> @@ -229,10 +229,15 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event
>>>>   #if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO)
>>>>   static irqreturn_t isr_uh_routine(int irq, void *user_data)
>>>>   {
>>>> +	perInterface_wlan_t *nic;
>>>> +	struct wilc *wl;
>>>> +
>>>> +	nic = netdev_priv(usedata);
>>> This patch breaks the build, which means you didn't even test build the
>>> series :(
>> Hi greg,
>>
>> I built every patches I'v posted and also there is no build error for this patch.
> I don't believe you, just look at the lines, it's obviously incorrect.
>
>> Would you please reconsider this patch again?
> Why would I ever accept a patch that is obviously wrong?  I would be a
> horrible subsystem maintainer, and you would not want me to merge an
> obviously broken patch from someone else into this driver, breaking it,
> right?

True. Sorry for wasting your time. I didn't look at the code carefully but just built on SDIO not SPI as usual.
I should have been more careful about this.
Again, sorry for the noise. I'll do this patches again.

>
> I have no idea why you would expect me to ever accept this patch as-is.
>
> greg k-h

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index b036b96..7b0614d 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -229,10 +229,15 @@  static int dev_state_ev_handler(struct notifier_block *this, unsigned long event
 #if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO)
 static irqreturn_t isr_uh_routine(int irq, void *user_data)
 {
+	perInterface_wlan_t *nic;
+	struct wilc *wl;
+
+	nic = netdev_priv(usedata);
+	wl = nic->wilc;
 	PRINT_D(INT_DBG, "Interrupt received UH\n");
 
 	/*While mac is closing cacncel the handling of any interrupts received*/
-	if (g_linux_wlan->close) {
+	if (wl->close) {
 		PRINT_ER("Driver is CLOSING: Can't handle UH interrupt\n");
 		return IRQ_HANDLED;
 	}
@@ -284,7 +289,7 @@  static int init_irq(struct net_device *dev)
 
 	if ((ret != -1) && (request_threaded_irq(wl->dev_irq_num, isr_uh_routine, isr_bh_routine,
 						  IRQF_TRIGGER_LOW | IRQF_ONESHOT,               /*Without IRQF_ONESHOT the uh will remain kicked in and dont gave a chance to bh*/
-						  "WILC_IRQ", wl)) < 0) {
+						  "WILC_IRQ", dev)) < 0) {
 
 		PRINT_ER("Failed to request IRQ for GPIO: %d\n", GPIO_NUM);
 		ret = -1;