[PATCH] sony-laptop: no need to unblock rfkill on load

[PATCH] sony-laptop: no need to unblock rfkill on load

[Alan Jenkins]

The re-written rfkill core ensures rfkill devices are initialized to
the system default state.  The core calls set_block after registration
so the driver shouldn't need to.

Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
---

This patch applies on top of the rfkill rewrite in the wireless-testing tree.

diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index aec0b27..c1b21a4 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -1114,7 +1114,6 @@ static int sony_nc_setup_rfkill(struct acpi_device *device,
 		return err;
 	}
 	sony_rfkill_devices[nc_type] = rfk;
-	sony_nc_rfkill_set((void *)nc_type, false);
 	return err;
 }
 

Re: [PATCH] sony-laptop: no need to unblock rfkill on load

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 869 bytes --]

On Mon, 2009-06-08 at 11:31 +0100, Alan Jenkins wrote:
> The re-written rfkill core ensures rfkill devices are initialized to
> the system default state.  The core calls set_block after registration
> so the driver shouldn't need to.
> 
> Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>

Good catch, thanks.

> ---
> 
> This patch applies on top of the rfkill rewrite in the wireless-testing tree.
> 
> diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
> index aec0b27..c1b21a4 100644
> --- a/drivers/platform/x86/sony-laptop.c
> +++ b/drivers/platform/x86/sony-laptop.c
> @@ -1114,7 +1114,6 @@ static int sony_nc_setup_rfkill(struct acpi_device *device,
>  		return err;
>  	}
>  	sony_rfkill_devices[nc_type] = rfk;
> -	sony_nc_rfkill_set((void *)nc_type, false);
>  	return err;
>  }
>  
> 
> 

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

Re: [PATCH] sony-laptop: no need to unblock rfkill on load

[Mattia Dongili]

[-- Attachment #1: Type: text/plain, Size: 1167 bytes --]

On Mon, Jun 08, 2009 at 12:36:58PM +0200, Johannes Berg wrote:
> On Mon, 2009-06-08 at 11:31 +0100, Alan Jenkins wrote:
> > The re-written rfkill core ensures rfkill devices are initialized to
> > the system default state.  The core calls set_block after registration
> > so the driver shouldn't need to.
> > 
> > Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
> 
> Good catch, thanks.

Just to confirm, is this patch going to sit in the wireless-testing tree
and you will submit it for inclusion together with the rfkill work
right?
 
> > ---
> > 
> > This patch applies on top of the rfkill rewrite in the wireless-testing tree.
> > 
> > diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
> > index aec0b27..c1b21a4 100644
> > --- a/drivers/platform/x86/sony-laptop.c
> > +++ b/drivers/platform/x86/sony-laptop.c
> > @@ -1114,7 +1114,6 @@ static int sony_nc_setup_rfkill(struct acpi_device *device,
> >  		return err;
> >  	}
> >  	sony_rfkill_devices[nc_type] = rfk;
> > -	sony_nc_rfkill_set((void *)nc_type, false);
> >  	return err;
> >  }
> >  
> > 
> > 

thanks
-- 
mattia
:wq!

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 197 bytes --]

Re: [PATCH] sony-laptop: no need to unblock rfkill on load

[Alan Jenkins]

Mattia Dongili wrote:
> On Mon, Jun 08, 2009 at 12:36:58PM +0200, Johannes Berg wrote:
>   
>> On Mon, 2009-06-08 at 11:31 +0100, Alan Jenkins wrote:
>>     
>>> The re-written rfkill core ensures rfkill devices are initialized to
>>> the system default state.  The core calls set_block after registration
>>> so the driver shouldn't need to.
>>>
>>> Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
>>>       
>> Good catch, thanks.
>>     
>
> Just to confirm, is this patch going to sit in the wireless-testing tree
> and you will submit it for inclusion together with the rfkill work
> right?
>   

Yes.  I probably didn't need to ping you at this point.

It just bothered me because I was effectively reverting a recent 
commit.  I figuired I should let you know.  In case it didn't work, when 
it was merged you'd know why I did it and who to blame.  But there is 
always Git history for that :-).

Regards
Alan

Re: [PATCH] sony-laptop: no need to unblock rfkill on load

[Mattia Dongili]

On Tue, Jun 09, 2009 at 09:31:31AM +0100, Alan Jenkins wrote:
> Mattia Dongili wrote:
>> On Mon, Jun 08, 2009 at 12:36:58PM +0200, Johannes Berg wrote:
>>   
>>> On Mon, 2009-06-08 at 11:31 +0100, Alan Jenkins wrote:
>>>     
>>>> The re-written rfkill core ensures rfkill devices are initialized to
>>>> the system default state.  The core calls set_block after registration
>>>> so the driver shouldn't need to.
>>>>
>>>> Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
>>>>       
>>> Good catch, thanks.
>>>     
>>
>> Just to confirm, is this patch going to sit in the wireless-testing tree
>> and you will submit it for inclusion together with the rfkill work
>> right?
>>   
>
> Yes.  I probably didn't need to ping you at this point.
>
> It just bothered me because I was effectively reverting a recent commit.  
> I figuired I should let you know.  In case it didn't work, when it was 
> merged you'd know why I did it and who to blame.  But there is always Git 
> history for that :-).

Errm... now that I look at that patch more closely, the code you're
modifying is not upstream either.
Anyway thanks for the ping, I'll take a look at what's going on in the
wireless-testing tree ;)

cheers
-- 
mattia
:wq!

Re: [PATCH] sony-laptop: no need to unblock rfkill on load

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 749 bytes --]

On Tue, 2009-06-09 at 18:21 +0900, Mattia Dongili wrote:

> > It just bothered me because I was effectively reverting a recent commit.  
> > I figuired I should let you know.  In case it didn't work, when it was 
> > merged you'd know why I did it and who to blame.  But there is always Git 
> > history for that :-).
> 
> Errm... now that I look at that patch more closely, the code you're
> modifying is not upstream either.
> Anyway thanks for the ping, I'll take a look at what's going on in the
> wireless-testing tree ;)

Sorry, I guess I forgot to copy you on the rfkill rewrite. Basically
I've rewritten the rfkill APIs and ported sony. Bug
http://bugzilla.kernel.org/show_bug.cgi?id=13458 is related to that too.

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]