Re: [PATCH 1/1] toshiba_acpi: Add support for bluetooth toggling through rfkill (v5)

Henrique de Moraes Holschuh
2008-08-20T01:29:56Z

On Sat, 16 Aug 2008, Philip Langdale wrote:
> @@ -607,7 +796,66 @@ static int __init toshiba_acpi_init(void)
> }
> toshiba_backlight_device->props.max_brightness = HCI_LCD_BRIGHTNESS_LEVELS - 1;
>
> - return (ACPI_SUCCESS(status)) ? 0 : -ENODEV;
> + /* Register rfkill switch for Bluetooth */
> + if (hci_get_bt_present(&bt_present) == HCI_SUCCESS && bt_present) {
> + toshiba_acpi.rfk_dev = rfkill_allocate(&toshiba_acpi.p_dev->dev,
> + RFKILL_TYPE_BLUETOOTH);
> + if (!toshiba_acpi.rfk_dev) {
> + printk(MY_ERR "unable to allocate rfkill device\n");
> + toshiba_acpi_exit();
> + return -ENOMEM;
> + }
> +
> + toshiba_acpi.rfk_dev->name = toshiba_acpi.bt_name;
> + toshiba_acpi.rfk_dev->state = RFKILL_STATE_OFF;

Where did that RFKILL_STATE_OFF came from ? :-) Just get rid of it, you
override it four statements later anyway...

> + toshiba_acpi.rfk_dev->toggle_radio = bt_rfkill_toggle_radio;
> + toshiba_acpi.rfk_dev->user_claim_unsupported = 1;
> + toshiba_acpi.rfk_dev->data = &toshiba_acpi;
> +
> + if (hci_get_bt_on(&bt_on) == HCI_SUCCESS && bt_on) {
> + toshiba_acpi.rfk_dev->state = RFKILL_STATE_UNBLOCKED;
> + } else if (hci_get_radio_state(&radio_on) == HCI_SUCCESS && radio_on) {
> + toshiba_acpi.rfk_dev->state = RFKILL_STATE_SOFT_BLOCKED;
> + } else {
> + toshiba_acpi.rfk_dev->state = RFKILL_STATE_HARD_BLOCKED;
> + }

i.e. in the code above.

Other than that, the rfkill bits look fine to me.

--
"One disk to rule them all, One disk to find them. One disk to bring
them all and in the darkness grind them. In the Land of Redmond
where the shadows lie." -- The Silicon Valley Tarot
Henrique Holschuh