3 files changed, 18 insertions, 19 deletions

diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
index 442b87476f97..93bb4247b7ed 100644
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -536,7 +536,7 @@ setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info,
         return err;
 }
 
-static inline void restart_syscall(struct pt_regs *regs)
+static inline void setup_syscall_restart(struct pt_regs *regs)
 {
         regs->ARM_r0 = regs->ARM_ORIG_r0;
         regs->ARM_pc -= thumb_mode(regs) ? 2 : 4;
@@ -571,7 +571,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka,
                         }
                         /* fallthrough */
                 case -ERESTARTNOINTR:
-                        restart_syscall(regs);
+                        setup_syscall_restart(regs);
                 }
         }
 
@@ -695,7 +695,7 @@ static int do_signal(sigset_t *oldset, struct pt_regs *regs, int syscall)
                 if (regs->ARM_r0 == -ERESTARTNOHAND ||
                     regs->ARM_r0 == -ERESTARTSYS ||
                     regs->ARM_r0 == -ERESTARTNOINTR) {
-                        restart_syscall(regs);
+                        setup_syscall_restart(regs);
                 }
         }
         single_step_set(current);
diff --git a/arch/arm/mach-pxa/tosa-bt.c b/arch/arm/mach-pxa/tosa-bt.c
index fb0294bd4310..c31e601eb49c 100644
--- a/arch/arm/mach-pxa/tosa-bt.c
+++ b/arch/arm/mach-pxa/tosa-bt.c
@@ -35,21 +35,25 @@ static void tosa_bt_off(struct tosa_bt_data *data)
         gpio_set_value(data->gpio_reset, 0);
 }
 
-static int tosa_bt_toggle_radio(void *data, enum rfkill_state state)
+static int tosa_bt_set_block(void *data, bool blocked)
 {
-        pr_info("BT_RADIO going: %s\n",
-                        state == RFKILL_STATE_ON ? "on" : "off");
+        pr_info("BT_RADIO going: %s\n", blocked ? "off" : "on");
 
-        if (state == RFKILL_STATE_ON) {
+        if (!blocked) {
                 pr_info("TOSA_BT: going ON\n");
                 tosa_bt_on(data);
         } else {
                 pr_info("TOSA_BT: going OFF\n");
                 tosa_bt_off(data);
         }
+
         return 0;
 }
 
+static const struct rfkill_ops tosa_bt_rfkill_ops = {
+        .set_block = tosa_bt_set_block,
+};
+
 static int tosa_bt_probe(struct platform_device *dev)
 {
         int rc;
@@ -70,18 +74,14 @@ static int tosa_bt_probe(struct platform_device *dev)
         if (rc)
                 goto err_pwr_dir;
 
-        rfk = rfkill_allocate(&dev->dev, RFKILL_TYPE_BLUETOOTH);
+        rfk = rfkill_alloc("tosa-bt", &dev->dev, RFKILL_TYPE_BLUETOOTH,
+                           &tosa_bt_rfkill_ops, data);
         if (!rfk) {
                 rc = -ENOMEM;
                 goto err_rfk_alloc;
         }
 
-        rfk->name = "tosa-bt";
-        rfk->toggle_radio = tosa_bt_toggle_radio;
-        rfk->data = data;
-#ifdef CONFIG_RFKILL_LEDS
-        rfk->led_trigger.name = "tosa-bt";
-#endif
+        rfkill_set_led_trigger_name(rfk, "tosa-bt");
 
         rc = rfkill_register(rfk);
         if (rc)
@@ -92,9 +92,7 @@ static int tosa_bt_probe(struct platform_device *dev)
         return 0;
 
 err_rfkill:
-        if (rfk)
-                rfkill_free(rfk);
-        rfk = NULL;
+        rfkill_destroy(rfk);
 err_rfk_alloc:
         tosa_bt_off(data);
 err_pwr_dir:
@@ -113,8 +111,10 @@ static int __devexit tosa_bt_remove(struct platform_device *dev)
 
         platform_set_drvdata(dev, NULL);
 
-        if (rfk)
+        if (rfk) {
                 rfkill_unregister(rfk);
+                rfkill_destroy(rfk);
+        }
         rfk = NULL;
 
         tosa_bt_off(data);
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index 168267a5dfb3..117ad5920e53 100644
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -31,7 +31,6 @@
 #include <linux/input.h>
 #include <linux/gpio.h>
 #include <linux/pda_power.h>
-#include <linux/rfkill.h>
 #include <linux/spi/spi.h>
 
 #include <asm/setup.h>