2009-04-09 18:22:09

by Reinette Chatre

Subject: sony-laptop still using rfkill's user_claim_unsupported

Hi Johannes and John,

I found this issue with sony-laptop when trying to compile. This patch
gets me compiling again but I do not know which avenue it should take as
this rfkill cleanup work is not in Linus's tree yet. What do you
suggest?

Thank you

Reinette


From: Reinette Chatre <[email protected]>

Commit f8c80fa6d4c16b20bc6960f229faeeb8f57ac80c "rfkill: remove user_claim
stuff" removed "user_claim_unsupported" from the rfkill struct. Remove
usage of this member from sony-laptop.

Signed-off-by: Reinette Chatre <[email protected]>
---
drivers/platform/x86/sony-laptop.c | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index a90ec5c..3c17995 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -1097,7 +1097,6 @@ static int sony_nc_setup_wifi_rfkill(struct acpi_device *device)
sony_wifi_rfkill->name = "sony-wifi";
sony_wifi_rfkill->toggle_radio = sony_nc_rfkill_set;
sony_wifi_rfkill->get_state = sony_nc_rfkill_get;
- sony_wifi_rfkill->user_claim_unsupported = 1;
sony_wifi_rfkill->data = (void *)SONY_WIFI;
err = rfkill_register(sony_wifi_rfkill);
if (err)
@@ -1119,7 +1118,6 @@ static int sony_nc_setup_bluetooth_rfkill(struct acpi_device *device)
sony_bluetooth_rfkill->name = "sony-bluetooth";
sony_bluetooth_rfkill->toggle_radio = sony_nc_rfkill_set;
sony_bluetooth_rfkill->get_state = sony_nc_rfkill_get;
- sony_bluetooth_rfkill->user_claim_unsupported = 1;
sony_bluetooth_rfkill->data = (void *)SONY_BLUETOOTH;
err = rfkill_register(sony_bluetooth_rfkill);
if (err)
@@ -1140,7 +1138,6 @@ static int sony_nc_setup_wwan_rfkill(struct acpi_device *device)
sony_wwan_rfkill->name = "sony-wwan";
sony_wwan_rfkill->toggle_radio = sony_nc_rfkill_set;
sony_wwan_rfkill->get_state = sony_nc_rfkill_get;
- sony_wwan_rfkill->user_claim_unsupported = 1;
sony_wwan_rfkill->data = (void *)SONY_WWAN;
err = rfkill_register(sony_wwan_rfkill);
if (err)
@@ -1161,7 +1158,6 @@ static int sony_nc_setup_wimax_rfkill(struct acpi_device *device)
sony_wimax_rfkill->name = "sony-wimax";
sony_wimax_rfkill->toggle_radio = sony_nc_rfkill_set;
sony_wimax_rfkill->get_state = sony_nc_rfkill_get;
- sony_wimax_rfkill->user_claim_unsupported = 1;
sony_wimax_rfkill->data = (void *)SONY_WIMAX;
err = rfkill_register(sony_wimax_rfkill);
if (err)
--
1.5.6.3

2009-04-09 18:45:50

by John W. Linville

Subject: Re: sony-laptop still using rfkill's user_claim_unsupported

On Thu, Apr 09, 2009 at 11:27:58AM -0700, reinette chatre wrote:
> Hi Johannes and John,
>
> I found this issue with sony-laptop when trying to compile. This patch
> gets me compiling again but I do not know which avenue it should take as
> this rfkill cleanup work is not in Linus's tree yet. What do you
> suggest?
>
> Thank you
>
> Reinette

I'll take it.

John
--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.