11 files changed, 37 insertions, 54 deletions

diff --git a/arch/alpha/include/asm/errno.h b/arch/alpha/include/asm/errno.h
index 69e2655249d2..98099bda9370 100644
--- a/arch/alpha/include/asm/errno.h
+++ b/arch/alpha/include/asm/errno.h
@@ -120,4 +120,6 @@
 #define EOWNERDEAD      136     /* Owner died */
 #define ENOTRECOVERABLE 137     /* State not recoverable */
 
+#define ERFKILL         138     /* Operation not possible due to RF-kill */
+
 #endif
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>
diff --git a/arch/avr32/kernel/signal.c b/arch/avr32/kernel/signal.c
index 803d7be0938f..27227561bad6 100644
--- a/arch/avr32/kernel/signal.c
+++ b/arch/avr32/kernel/signal.c
@@ -212,7 +212,7 @@ out:
         return err;
 }
 
-static inline void restart_syscall(struct pt_regs *regs)
+static inline void setup_syscall_restart(struct pt_regs *regs)
 {
         if (regs->r12 == -ERESTART_RESTARTBLOCK)
                 regs->r8 = __NR_restart_syscall;
@@ -296,7 +296,7 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset, int syscall)
                         }
                         /* fall through */
                 case -ERESTARTNOINTR:
-                        restart_syscall(regs);
+                        setup_syscall_restart(regs);
                 }
         }
 
diff --git a/arch/mips/include/asm/errno.h b/arch/mips/include/asm/errno.h
index 3c0d840e4577..a0efc73819e4 100644
--- a/arch/mips/include/asm/errno.h
+++ b/arch/mips/include/asm/errno.h
@@ -119,6 +119,8 @@
 #define EOWNERDEAD      165     /* Owner died */
 #define ENOTRECOVERABLE 166     /* State not recoverable */
 
+#define ERFKILL         167     /* Operation not possible due to RF-kill */
+
 #define EDQUOT          1133    /* Quota exceeded */
 
 #ifdef __KERNEL__
diff --git a/arch/parisc/include/asm/errno.h b/arch/parisc/include/asm/errno.h
index e2f3ddc796be..9992abdd782d 100644
--- a/arch/parisc/include/asm/errno.h
+++ b/arch/parisc/include/asm/errno.h
@@ -120,5 +120,6 @@
 #define EOWNERDEAD      254     /* Owner died */
 #define ENOTRECOVERABLE 255     /* State not recoverable */
 
+#define ERFKILL         256     /* Operation not possible due to RF-kill */
 
 #endif
diff --git a/arch/powerpc/include/asm/qe.h b/arch/powerpc/include/asm/qe.h
index e0faf332c9c9..157c5ca581c8 100644
--- a/arch/powerpc/include/asm/qe.h
+++ b/arch/powerpc/include/asm/qe.h
@@ -675,6 +675,8 @@ struct ucc_slow_pram {
 #define UCC_GETH_UPSMR_RMM      0x00001000
 #define UCC_GETH_UPSMR_CAM      0x00000400
 #define UCC_GETH_UPSMR_BRO      0x00000200
+#define UCC_GETH_UPSMR_SMM      0x00000080
+#define UCC_GETH_UPSMR_SGMM     0x00000020
 
 /* UCC Transmit On Demand Register (UTODR) */
 #define UCC_SLOW_TOD    0x8000
diff --git a/arch/powerpc/platforms/82xx/ep8248e.c b/arch/powerpc/platforms/82xx/ep8248e.c
index 0eb6d7f62241..51fcae41f08a 100644
--- a/arch/powerpc/platforms/82xx/ep8248e.c
+++ b/arch/powerpc/platforms/82xx/ep8248e.c
@@ -14,6 +14,7 @@
 #include <linux/interrupt.h>
 #include <linux/fsl_devices.h>
 #include <linux/mdio-bitbang.h>
+#include <linux/of_mdio.h>
 #include <linux/of_platform.h>
 
 #include <asm/io.h>
@@ -115,7 +116,7 @@ static int __devinit ep8248e_mdio_probe(struct of_device *ofdev,
         struct mii_bus *bus;
         struct resource res;
         struct device_node *node;
-        int ret, i;
+        int ret;
 
         node = of_get_parent(ofdev->node);
         of_node_put(node);
@@ -130,17 +131,13 @@ static int __devinit ep8248e_mdio_probe(struct of_device *ofdev,
         if (!bus)
                 return -ENOMEM;
 
-        bus->phy_mask = 0;
         bus->irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);
 
-        for (i = 0; i < PHY_MAX_ADDR; i++)
-                bus->irq[i] = -1;
-
         bus->name = "ep8248e-mdio-bitbang";
         bus->parent = &ofdev->dev;
         snprintf(bus->id, MII_BUS_ID_SIZE, "%x", res.start);
 
-        return mdiobus_register(bus);
+        return of_mdiobus_register(bus, ofdev->node);
 }
 
 static int ep8248e_mdio_remove(struct of_device *ofdev)
diff --git a/arch/powerpc/platforms/pasemi/gpio_mdio.c b/arch/powerpc/platforms/pasemi/gpio_mdio.c
index 75cc165d5bee..3bf546797cbb 100644
--- a/arch/powerpc/platforms/pasemi/gpio_mdio.c
+++ b/arch/powerpc/platforms/pasemi/gpio_mdio.c
@@ -29,7 +29,7 @@
 #include <linux/ioport.h>
 #include <linux/interrupt.h>
 #include <linux/phy.h>
-#include <linux/platform_device.h>
+#include <linux/of_mdio.h>
 #include <linux/of_platform.h>
 
 #define DELAY 1
@@ -39,6 +39,7 @@ static void __iomem *gpio_regs;
 struct gpio_priv {
         int mdc_pin;
         int mdio_pin;
+        int mdio_irqs[PHY_MAX_ADDR];
 };
 
 #define MDC_PIN(bus)    (((struct gpio_priv *)bus->priv)->mdc_pin)
@@ -218,12 +219,11 @@ static int __devinit gpio_mdio_probe(struct of_device *ofdev,
                                      const struct of_device_id *match)
 {
         struct device *dev = &ofdev->dev;
-        struct device_node *phy_dn, *np = ofdev->node;
+        struct device_node *np = ofdev->node;
         struct mii_bus *new_bus;
         struct gpio_priv *priv;
         const unsigned int *prop;
         int err;
-        int i;
 
         err = -ENOMEM;
         priv = kzalloc(sizeof(struct gpio_priv), GFP_KERNEL);
@@ -244,27 +244,7 @@ static int __devinit gpio_mdio_probe(struct of_device *ofdev,
         snprintf(new_bus->id, MII_BUS_ID_SIZE, "%x", *prop);
         new_bus->priv = priv;
 
-        new_bus->phy_mask = 0;
-
-        new_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);
-
-        if (!new_bus->irq)
-                goto out_free_bus;
-
-        for (i = 0; i < PHY_MAX_ADDR; i++)
-                new_bus->irq[i] = NO_IRQ;
-
-        for (phy_dn = of_get_next_child(np, NULL);
-             phy_dn != NULL;
-             phy_dn = of_get_next_child(np, phy_dn)) {
-                const unsigned int *ip, *regp;
-
-                ip = of_get_property(phy_dn, "interrupts", NULL);
-                regp = of_get_property(phy_dn, "reg", NULL);
-                if (!ip || !regp || *regp >= PHY_MAX_ADDR)
-                        continue;
-                new_bus->irq[*regp] = irq_create_mapping(NULL, *ip);
-        }
+        new_bus->irq = priv->mdio_irqs;
 
         prop = of_get_property(np, "mdc-pin", NULL);
         priv->mdc_pin = *prop;
@@ -275,7 +255,7 @@ static int __devinit gpio_mdio_probe(struct of_device *ofdev,
         new_bus->parent = dev;
         dev_set_drvdata(dev, new_bus);
 
-        err = mdiobus_register(new_bus);
+        err = of_mdiobus_register(new_bus, np);
 
         if (err != 0) {
                 printk(KERN_ERR "%s: Cannot register as MDIO bus, err %d\n",
@@ -286,8 +266,6 @@ static int __devinit gpio_mdio_probe(struct of_device *ofdev,
         return 0;
 
 out_free_irq:
-        kfree(new_bus->irq);
-out_free_bus:
         kfree(new_bus);
 out_free_priv:
         kfree(priv);
diff --git a/arch/sparc/include/asm/errno.h b/arch/sparc/include/asm/errno.h
index a9ef172977de..4e2bc490d714 100644
--- a/arch/sparc/include/asm/errno.h
+++ b/arch/sparc/include/asm/errno.h
@@ -110,4 +110,6 @@
 #define EOWNERDEAD      132     /* Owner died */
 #define ENOTRECOVERABLE 133     /* State not recoverable */
 
+#define ERFKILL         134     /* Operation not possible due to RF-kill */
+
 #endif