Merge tag 'driver-core-3.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core __dev* removal patches - take 3 - from Greg Kroah-Hartman:
 "Here are the remaining __dev* removal patches against the 3.8-rc2
  tree.  All of these patches were previously sent to the subsystem
  maintainers, most of them were picked up and pushed to you, but there
  were a number that fell through the cracks, and new drivers were added
  during the merge window, so this series cleans up the rest of the
  instances of these markings.

  Third time's the charm...

  Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"

Fixed up trivial conflict with the pinctrl pull in pinctrl-sirf.c.

* tag 'driver-core-3.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (54 commits)
  misc: remove __dev* attributes.
  include: remove __dev* attributes.
  Documentation: remove __dev* attributes.
  Drivers: misc: remove __dev* attributes.
  Drivers: block: remove __dev* attributes.
  Drivers: bcma: remove __dev* attributes.
  Drivers: char: remove __dev* attributes.
  Drivers: clocksource: remove __dev* attributes.
  Drivers: ssb: remove __dev* attributes.
  Drivers: dma: remove __dev* attributes.
  Drivers: gpu: remove __dev* attributes.
  Drivers: infinband: remove __dev* attributes.
  Drivers: memory: remove __dev* attributes.
  Drivers: mmc: remove __dev* attributes.
  Drivers: iommu: remove __dev* attributes.
  Drivers: power: remove __dev* attributes.
  Drivers: message: remove __dev* attributes.
  Drivers: macintosh: remove __dev* attributes.
  Drivers: mfd: remove __dev* attributes.
  pstore: remove __dev* attributes.
  ...

13 files changed, 36 insertions, 36 deletions

diff --git a/drivers/media/rc/ene_ir.c b/drivers/media/rc/ene_ir.c
index 22231dd4f62b..cef04786b52f 100644
--- a/drivers/media/rc/ene_ir.c
+++ b/drivers/media/rc/ene_ir.c
@@ -1172,7 +1172,7 @@ static struct pnp_driver ene_driver = {
         .flags = PNP_DRIVER_RES_DO_NOT_CHANGE,
 
         .probe = ene_probe,
-        .remove = __devexit_p(ene_remove),
+        .remove = ene_remove,
 #ifdef CONFIG_PM
         .suspend = ene_suspend,
         .resume = ene_resume,
diff --git a/drivers/media/rc/fintek-cir.c b/drivers/media/rc/fintek-cir.c
index 936c3f79b62c..1df410e13688 100644
--- a/drivers/media/rc/fintek-cir.c
+++ b/drivers/media/rc/fintek-cir.c
@@ -590,7 +590,7 @@ failure:
         return ret;
 }
 
-static void __devexit fintek_remove(struct pnp_dev *pdev)
+static void fintek_remove(struct pnp_dev *pdev)
 {
         struct fintek_dev *fintek = pnp_get_drvdata(pdev);
         unsigned long flags;
@@ -678,7 +678,7 @@ static struct pnp_driver fintek_driver = {
         .id_table       = fintek_ids,
         .flags          = PNP_DRIVER_RES_DO_NOT_CHANGE,
         .probe          = fintek_probe,
-        .remove         = __devexit_p(fintek_remove),
+        .remove         = fintek_remove,
         .suspend        = fintek_suspend,
         .resume         = fintek_resume,
         .shutdown       = fintek_shutdown,
diff --git a/drivers/media/rc/gpio-ir-recv.c b/drivers/media/rc/gpio-ir-recv.c
index ba1a1eb356cf..4f71a7d1f019 100644
--- a/drivers/media/rc/gpio-ir-recv.c
+++ b/drivers/media/rc/gpio-ir-recv.c
@@ -58,7 +58,7 @@ err_get_value:
         return IRQ_HANDLED;
 }
 
-static int __devinit gpio_ir_recv_probe(struct platform_device *pdev)
+static int gpio_ir_recv_probe(struct platform_device *pdev)
 {
         struct gpio_rc_dev *gpio_dev;
         struct rc_dev *rcdev;
@@ -140,7 +140,7 @@ err_allocate_device:
         return rc;
 }
 
-static int __devexit gpio_ir_recv_remove(struct platform_device *pdev)
+static int gpio_ir_recv_remove(struct platform_device *pdev)
 {
         struct gpio_rc_dev *gpio_dev = platform_get_drvdata(pdev);
 
@@ -188,7 +188,7 @@ static const struct dev_pm_ops gpio_ir_recv_pm_ops = {
 
 static struct platform_driver gpio_ir_recv_driver = {
         .probe  = gpio_ir_recv_probe,
-        .remove = __devexit_p(gpio_ir_recv_remove),
+        .remove = gpio_ir_recv_remove,
         .driver = {
                 .name   = GPIO_IR_DRIVER_NAME,
                 .owner  = THIS_MODULE,
diff --git a/drivers/media/rc/iguanair.c b/drivers/media/rc/iguanair.c
index 5a9163da63c3..b99b096d8a8f 100644
--- a/drivers/media/rc/iguanair.c
+++ b/drivers/media/rc/iguanair.c
@@ -425,8 +425,8 @@ static void iguanair_close(struct rc_dev *rdev)
         mutex_unlock(&ir->lock);
 }
 
-static int __devinit iguanair_probe(struct usb_interface *intf,
-                                                const struct usb_device_id *id)
+static int iguanair_probe(struct usb_interface *intf,
+                          const struct usb_device_id *id)
 {
         struct usb_device *udev = interface_to_usbdev(intf);
         struct iguanair *ir;
@@ -538,7 +538,7 @@ out:
         return ret;
 }
 
-static void __devexit iguanair_disconnect(struct usb_interface *intf)
+static void iguanair_disconnect(struct usb_interface *intf)
 {
         struct iguanair *ir = usb_get_intfdata(intf);
 
@@ -604,7 +604,7 @@ static const struct usb_device_id iguanair_table[] = {
 static struct usb_driver iguanair_driver = {
         .name = DRIVER_NAME,
         .probe = iguanair_probe,
-        .disconnect = __devexit_p(iguanair_disconnect),
+        .disconnect = iguanair_disconnect,
         .suspend = iguanair_suspend,
         .resume = iguanair_resume,
         .reset_resume = iguanair_resume,
diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c
index 8f6a28921ed4..78d109b978dd 100644
--- a/drivers/media/rc/imon.c
+++ b/drivers/media/rc/imon.c
@@ -255,7 +255,7 @@ static struct usb_device_id imon_usb_id_table[] = {
 static struct usb_driver imon_driver = {
         .name           = MOD_NAME,
         .probe          = imon_probe,
-        .disconnect     = __devexit_p(imon_disconnect),
+        .disconnect     = imon_disconnect,
         .suspend        = imon_suspend,
         .resume         = imon_resume,
         .id_table       = imon_usb_id_table,
@@ -2288,8 +2288,8 @@ static void imon_init_display(struct imon_context *ictx,
 /**
  * Callback function for USB core API: Probe
  */
-static int __devinit imon_probe(struct usb_interface *interface,
-                                const struct usb_device_id *id)
+static int imon_probe(struct usb_interface *interface,
+                      const struct usb_device_id *id)
 {
         struct usb_device *usbdev = NULL;
         struct usb_host_interface *iface_desc = NULL;
@@ -2372,7 +2372,7 @@ fail:
 /**
  * Callback function for USB core API: disconnect
  */
-static void __devexit imon_disconnect(struct usb_interface *interface)
+static void imon_disconnect(struct usb_interface *interface)
 {
         struct imon_context *ictx;
         struct device *dev;
diff --git a/drivers/media/rc/ir-rx51.c b/drivers/media/rc/ir-rx51.c
index 9e76c7b40af2..8ead492d03aa 100644
--- a/drivers/media/rc/ir-rx51.c
+++ b/drivers/media/rc/ir-rx51.c
@@ -443,7 +443,7 @@ static int lirc_rx51_resume(struct platform_device *dev)
 
 #endif /* CONFIG_PM */
 
-static int __devinit lirc_rx51_probe(struct platform_device *dev)
+static int lirc_rx51_probe(struct platform_device *dev)
 {
         lirc_rx51_driver.features = LIRC_RX51_DRIVER_FEATURES;
         lirc_rx51.pdata = dev->dev.platform_data;
diff --git a/drivers/media/rc/ite-cir.c b/drivers/media/rc/ite-cir.c
index 5e5a7f2b8184..1b8669b6d042 100644
--- a/drivers/media/rc/ite-cir.c
+++ b/drivers/media/rc/ite-cir.c
@@ -1620,7 +1620,7 @@ failure:
         return ret;
 }
 
-static void __devexit ite_remove(struct pnp_dev *pdev)
+static void ite_remove(struct pnp_dev *pdev)
 {
         struct ite_dev *dev = pnp_get_drvdata(pdev);
         unsigned long flags;
@@ -1702,7 +1702,7 @@ static struct pnp_driver ite_driver = {
         .name           = ITE_DRIVER_NAME,
         .id_table       = ite_ids,
         .probe          = ite_probe,
-        .remove         = __devexit_p(ite_remove),
+        .remove         = ite_remove,
         .suspend        = ite_suspend,
         .resume         = ite_resume,
         .shutdown       = ite_shutdown,
diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c
index b2146cd99fd8..9afb9331217d 100644
--- a/drivers/media/rc/mceusb.c
+++ b/drivers/media/rc/mceusb.c
@@ -1229,8 +1229,8 @@ out:
         return NULL;
 }
 
-static int __devinit mceusb_dev_probe(struct usb_interface *intf,
-                                      const struct usb_device_id *id)
+static int mceusb_dev_probe(struct usb_interface *intf,
+                            const struct usb_device_id *id)
 {
         struct usb_device *dev = interface_to_usbdev(intf);
         struct usb_host_interface *idesc;
@@ -1393,7 +1393,7 @@ mem_alloc_fail:
 }
 
 
-static void __devexit mceusb_dev_disconnect(struct usb_interface *intf)
+static void mceusb_dev_disconnect(struct usb_interface *intf)
 {
         struct usb_device *dev = interface_to_usbdev(intf);
         struct mceusb_dev *ir = usb_get_intfdata(intf);
@@ -1432,7 +1432,7 @@ static int mceusb_dev_resume(struct usb_interface *intf)
 static struct usb_driver mceusb_dev_driver = {
         .name =         DRIVER_NAME,
         .probe =        mceusb_dev_probe,
-        .disconnect =   __devexit_p(mceusb_dev_disconnect),
+        .disconnect =   mceusb_dev_disconnect,
         .suspend =      mceusb_dev_suspend,
         .resume =       mceusb_dev_resume,
         .reset_resume = mceusb_dev_resume,
diff --git a/drivers/media/rc/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c
index e4ea89a11eed..b8aa9abb31ff 100644
--- a/drivers/media/rc/nuvoton-cir.c
+++ b/drivers/media/rc/nuvoton-cir.c
@@ -1113,7 +1113,7 @@ failure:
         return ret;
 }
 
-static void __devexit nvt_remove(struct pnp_dev *pdev)
+static void nvt_remove(struct pnp_dev *pdev)
 {
         struct nvt_dev *nvt = pnp_get_drvdata(pdev);
         unsigned long flags;
@@ -1211,7 +1211,7 @@ static struct pnp_driver nvt_driver = {
         .id_table       = nvt_ids,
         .flags          = PNP_DRIVER_RES_DO_NOT_CHANGE,
         .probe          = nvt_probe,
-        .remove         = __devexit_p(nvt_remove),
+        .remove         = nvt_remove,
         .suspend        = nvt_suspend,
         .resume         = nvt_resume,
         .shutdown       = nvt_shutdown,
diff --git a/drivers/media/rc/redrat3.c b/drivers/media/rc/redrat3.c
index a8887aba9faf..1800326f93e6 100644
--- a/drivers/media/rc/redrat3.c
+++ b/drivers/media/rc/redrat3.c
@@ -1102,8 +1102,8 @@ out:
         return NULL;
 }
 
-static int __devinit redrat3_dev_probe(struct usb_interface *intf,
-                                       const struct usb_device_id *id)
+static int redrat3_dev_probe(struct usb_interface *intf,
+                             const struct usb_device_id *id)
 {
         struct usb_device *udev = interface_to_usbdev(intf);
         struct device *dev = &intf->dev;
@@ -1241,7 +1241,7 @@ no_endpoints:
         return retval;
 }
 
-static void __devexit redrat3_dev_disconnect(struct usb_interface *intf)
+static void redrat3_dev_disconnect(struct usb_interface *intf)
 {
         struct usb_device *udev = interface_to_usbdev(intf);
         struct redrat3_dev *rr3 = usb_get_intfdata(intf);
@@ -1281,7 +1281,7 @@ static int redrat3_dev_resume(struct usb_interface *intf)
 static struct usb_driver redrat3_dev_driver = {
         .name           = DRIVER_NAME,
         .probe          = redrat3_dev_probe,
-        .disconnect     = __devexit_p(redrat3_dev_disconnect),
+        .disconnect     = redrat3_dev_disconnect,
         .suspend        = redrat3_dev_suspend,
         .resume         = redrat3_dev_resume,
         .reset_resume   = redrat3_dev_resume,
diff --git a/drivers/media/rc/streamzap.c b/drivers/media/rc/streamzap.c
index c720f12f661e..d7b11e6a9982 100644
--- a/drivers/media/rc/streamzap.c
+++ b/drivers/media/rc/streamzap.c
@@ -346,8 +346,8 @@ out:
  *      On any failure the return value is the ERROR
  *      On success return 0
  */
-static int __devinit streamzap_probe(struct usb_interface *intf,
-                                     const struct usb_device_id *id)
+static int streamzap_probe(struct usb_interface *intf,
+                           const struct usb_device_id *id)
 {
         struct usb_device *usbdev = interface_to_usbdev(intf);
         struct usb_host_interface *iface_host;
diff --git a/drivers/media/rc/ttusbir.c b/drivers/media/rc/ttusbir.c
index f0921b5483eb..78be8a914225 100644
--- a/drivers/media/rc/ttusbir.c
+++ b/drivers/media/rc/ttusbir.c
@@ -194,8 +194,8 @@ static void ttusbir_urb_complete(struct urb *urb)
                 dev_warn(tt->dev, "failed to resubmit urb: %d\n", rc);
 }
 
-static int __devinit ttusbir_probe(struct usb_interface *intf,
-                                                const struct usb_device_id *id)
+static int ttusbir_probe(struct usb_interface *intf,
+                         const struct usb_device_id *id)
 {
         struct ttusbir *tt;
         struct usb_interface_descriptor *idesc;
@@ -367,7 +367,7 @@ out:
         return ret;
 }
 
-static void __devexit ttusbir_disconnect(struct usb_interface *intf)
+static void ttusbir_disconnect(struct usb_interface *intf)
 {
         struct ttusbir *tt = usb_get_intfdata(intf);
         struct usb_device *udev = tt->udev;
@@ -435,7 +435,7 @@ static struct usb_driver ttusbir_driver = {
         .suspend = ttusbir_suspend,
         .resume = ttusbir_resume,
         .reset_resume = ttusbir_resume,
-        .disconnect = __devexit_p(ttusbir_disconnect)
+        .disconnect = ttusbir_disconnect,
 };
 
 module_usb_driver(ttusbir_driver);
diff --git a/drivers/media/rc/winbond-cir.c b/drivers/media/rc/winbond-cir.c
index 7f3c476dde05..930c61499037 100644
--- a/drivers/media/rc/winbond-cir.c
+++ b/drivers/media/rc/winbond-cir.c
@@ -1008,7 +1008,7 @@ wbcir_resume(struct pnp_dev *device)
         return 0;
 }
 
-static int __devinit
+static int
 wbcir_probe(struct pnp_dev *device, const struct pnp_device_id *dev_id)
 {
         struct device *dev = &device->dev;
@@ -1155,7 +1155,7 @@ exit:
         return err;
 }
 
-static void __devexit
+static void
 wbcir_remove(struct pnp_dev *device)
 {
         struct wbcir_data *data = pnp_get_drvdata(device);
@@ -1201,7 +1201,7 @@ static struct pnp_driver wbcir_driver = {
         .name     = WBCIR_NAME,
         .id_table = wbcir_ids,
         .probe    = wbcir_probe,
-        .remove   = __devexit_p(wbcir_remove),
+        .remove   = wbcir_remove,
         .suspend  = wbcir_suspend,
         .resume   = wbcir_resume,
         .shutdown = wbcir_shutdown