Merge branch 'origin' into devel

Conflicts:
	sound/soc/pxa/pxa2xx-i2s.c

8 files changed, 57 insertions, 66 deletions

diff --git a/drivers/scsi/a4000t.c b/drivers/scsi/a4000t.c
index d4bda2017746..61af3d91ac8a 100644
--- a/drivers/scsi/a4000t.c
+++ b/drivers/scsi/a4000t.c
@@ -35,7 +35,7 @@ static struct platform_device *a4000t_scsi_device;
 
 #define A4000T_SCSI_ADDR 0xdd0040
 
-static int __devinit a4000t_probe(struct device *dev)
+static int __devinit a4000t_probe(struct platform_device *dev)
 {
         struct Scsi_Host *host;
         struct NCR_700_Host_Parameters *hostdata;
@@ -61,7 +61,8 @@ static int __devinit a4000t_probe(struct device *dev)
         hostdata->dcntl_extra = EA_710;
 
         /* and register the chip */
-        host = NCR_700_detect(&a4000t_scsi_driver_template, hostdata, dev);
+        host = NCR_700_detect(&a4000t_scsi_driver_template, hostdata,
+                              &dev->dev);
         if (!host) {
                 printk(KERN_ERR "a4000t-scsi: No host detected; "
                                 "board configuration problem?\n");
@@ -78,7 +79,7 @@ static int __devinit a4000t_probe(struct device *dev)
                 goto out_put_host;
         }
 
-        dev_set_drvdata(dev, host);
+        platform_set_drvdata(dev, host);
         scsi_scan_host(host);
 
         return 0;
@@ -93,9 +94,9 @@ static int __devinit a4000t_probe(struct device *dev)
         return -ENODEV;
 }
 
-static __devexit int a4000t_device_remove(struct device *dev)
+static __devexit int a4000t_device_remove(struct platform_device *dev)
 {
-        struct Scsi_Host *host = dev_get_drvdata(dev);
+        struct Scsi_Host *host = platform_get_drvdata(dev);
         struct NCR_700_Host_Parameters *hostdata = shost_priv(host);
 
         scsi_remove_host(host);
@@ -108,25 +109,27 @@ static __devexit int a4000t_device_remove(struct device *dev)
         return 0;
 }
 
-static struct device_driver a4000t_scsi_driver = {
-        .name   = "a4000t-scsi",
-        .bus    = &platform_bus_type,
-        .probe  = a4000t_probe,
-        .remove = __devexit_p(a4000t_device_remove),
+static struct platform_driver a4000t_scsi_driver = {
+        .driver = {
+                .name           = "a4000t-scsi",
+                .owner          = THIS_MODULE,
+        },
+        .probe          = a4000t_probe,
+        .remove         = __devexit_p(a4000t_device_remove),
 };
 
 static int __init a4000t_scsi_init(void)
 {
         int err;
 
-        err = driver_register(&a4000t_scsi_driver);
+        err = platform_driver_register(&a4000t_scsi_driver);
         if (err)
                 return err;
 
         a4000t_scsi_device = platform_device_register_simple("a4000t-scsi",
                         -1, NULL, 0);
         if (IS_ERR(a4000t_scsi_device)) {
-                driver_unregister(&a4000t_scsi_driver);
+                platform_driver_register(&a4000t_scsi_driver);
                 return PTR_ERR(a4000t_scsi_device);
         }
 
@@ -136,7 +139,7 @@ static int __init a4000t_scsi_init(void)
 static void __exit a4000t_scsi_exit(void)
 {
         platform_device_unregister(a4000t_scsi_device);
-        driver_unregister(&a4000t_scsi_driver);
+        platform_driver_unregister(&a4000t_scsi_driver);
 }
 
 module_init(a4000t_scsi_init);
diff --git a/drivers/scsi/atari_NCR5380.c b/drivers/scsi/atari_NCR5380.c
index 93b61f148653..0471f8800483 100644
--- a/drivers/scsi/atari_NCR5380.c
+++ b/drivers/scsi/atari_NCR5380.c
@@ -844,7 +844,7 @@ static char *lprint_Scsi_Cmnd(Scsi_Cmnd *cmd, char *pos, char *buffer, int lengt
  *
  */
 
-static int NCR5380_init(struct Scsi_Host *instance, int flags)
+static int __init NCR5380_init(struct Scsi_Host *instance, int flags)
 {
         int i;
         SETUP_HOSTDATA(instance);
diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c
index 21fe07f9df87..ad7a23aef0ec 100644
--- a/drivers/scsi/atari_scsi.c
+++ b/drivers/scsi/atari_scsi.c
@@ -589,7 +589,7 @@ int atari_queue_command(Scsi_Cmnd *cmd, void (*done)(Scsi_Cmnd *))
 #endif
 
 
-int atari_scsi_detect(struct scsi_host_template *host)
+int __init atari_scsi_detect(struct scsi_host_template *host)
 {
         static int called = 0;
         struct Scsi_Host *instance;
diff --git a/drivers/scsi/bvme6000_scsi.c b/drivers/scsi/bvme6000_scsi.c
index d858f3d41274..5799cb5cba6b 100644
--- a/drivers/scsi/bvme6000_scsi.c
+++ b/drivers/scsi/bvme6000_scsi.c
@@ -34,7 +34,7 @@ static struct scsi_host_template bvme6000_scsi_driver_template = {
 static struct platform_device *bvme6000_scsi_device;
 
 static __devinit int
-bvme6000_probe(struct device *dev)
+bvme6000_probe(struct platform_device *dev)
 {
         struct Scsi_Host *host;
         struct NCR_700_Host_Parameters *hostdata;
@@ -58,7 +58,8 @@ bvme6000_probe(struct device *dev)
         hostdata->ctest7_extra = CTEST7_TT1;
 
         /* and register the chip */
-        host = NCR_700_detect(&bvme6000_scsi_driver_template, hostdata, dev);
+        host = NCR_700_detect(&bvme6000_scsi_driver_template, hostdata,
+                              &dev->dev);
         if (!host) {
                 printk(KERN_ERR "bvme6000-scsi: No host detected; "
                                 "board configuration problem?\n");
@@ -73,7 +74,7 @@ bvme6000_probe(struct device *dev)
                 goto out_put_host;
         }
 
-        dev_set_drvdata(dev, host);
+        platform_set_drvdata(dev, host);
         scsi_scan_host(host);
 
         return 0;
@@ -87,9 +88,9 @@ bvme6000_probe(struct device *dev)
 }
 
 static __devexit int
-bvme6000_device_remove(struct device *dev)
+bvme6000_device_remove(struct platform_device *dev)
 {
-        struct Scsi_Host *host = dev_get_drvdata(dev);
+        struct Scsi_Host *host = platform_get_drvdata(dev);
         struct NCR_700_Host_Parameters *hostdata = shost_priv(host);
 
         scsi_remove_host(host);
@@ -100,25 +101,27 @@ bvme6000_device_remove(struct device *dev)
         return 0;
 }
 
-static struct device_driver bvme6000_scsi_driver = {
-        .name   = "bvme6000-scsi",
-        .bus    = &platform_bus_type,
-        .probe  = bvme6000_probe,
-        .remove = __devexit_p(bvme6000_device_remove),
+static struct platform_driver bvme6000_scsi_driver = {
+        .driver = {
+                .name           = "bvme6000-scsi",
+                .owner          = THIS_MODULE,
+        },
+        .probe          = bvme6000_probe,
+        .remove         = __devexit_p(bvme6000_device_remove),
 };
 
 static int __init bvme6000_scsi_init(void)
 {
         int err;
 
-        err = driver_register(&bvme6000_scsi_driver);
+        err = platform_driver_register(&bvme6000_scsi_driver);
         if (err)
                 return err;
 
         bvme6000_scsi_device = platform_device_register_simple("bvme6000-scsi",
                                                                -1, NULL, 0);
         if (IS_ERR(bvme6000_scsi_device)) {
-                driver_unregister(&bvme6000_scsi_driver);
+                platform_driver_unregister(&bvme6000_scsi_driver);
                 return PTR_ERR(bvme6000_scsi_device);
         }
 
@@ -128,7 +131,7 @@ static int __init bvme6000_scsi_init(void)
 static void __exit bvme6000_scsi_exit(void)
 {
         platform_device_unregister(bvme6000_scsi_device);
-        driver_unregister(&bvme6000_scsi_driver);
+        platform_driver_unregister(&bvme6000_scsi_driver);
 }
 
 module_init(bvme6000_scsi_init);
diff --git a/drivers/scsi/mvme16x_scsi.c b/drivers/scsi/mvme16x_scsi.c
index b264b499d982..b5fbfd6ce870 100644
--- a/drivers/scsi/mvme16x_scsi.c
+++ b/drivers/scsi/mvme16x_scsi.c
@@ -34,7 +34,7 @@ static struct scsi_host_template mvme16x_scsi_driver_template = {
 static struct platform_device *mvme16x_scsi_device;
 
 static __devinit int
-mvme16x_probe(struct device *dev)
+mvme16x_probe(struct platform_device *dev)
 {
         struct Scsi_Host * host = NULL;
         struct NCR_700_Host_Parameters *hostdata;
@@ -64,7 +64,8 @@ mvme16x_probe(struct device *dev)
         hostdata->ctest7_extra = CTEST7_TT1;
 
         /* and register the chip */
-        host = NCR_700_detect(&mvme16x_scsi_driver_template, hostdata, dev);
+        host = NCR_700_detect(&mvme16x_scsi_driver_template, hostdata,
+                              &dev->dev);
         if (!host) {
                 printk(KERN_ERR "mvme16x-scsi: No host detected; "
                                 "board configuration problem?\n");
@@ -88,7 +89,7 @@ mvme16x_probe(struct device *dev)
                 out_be32(0xfff4202c, v);
         }
 
-        dev_set_drvdata(dev, host);
+        platform_set_drvdata(dev, host);
         scsi_scan_host(host);
 
         return 0;
@@ -102,9 +103,9 @@ mvme16x_probe(struct device *dev)
 }
 
 static __devexit int
-mvme16x_device_remove(struct device *dev)
+mvme16x_device_remove(struct platform_device *dev)
 {
-        struct Scsi_Host *host = dev_get_drvdata(dev);
+        struct Scsi_Host *host = platform_get_drvdata(dev);
         struct NCR_700_Host_Parameters *hostdata = shost_priv(host);
 
         /* Disable scsi chip ints */
@@ -123,25 +124,27 @@ mvme16x_device_remove(struct device *dev)
         return 0;
 }
 
-static struct device_driver mvme16x_scsi_driver = {
-        .name   = "mvme16x-scsi",
-        .bus    = &platform_bus_type,
-        .probe  = mvme16x_probe,
-        .remove = __devexit_p(mvme16x_device_remove),
+static struct platform_driver mvme16x_scsi_driver = {
+        .driver = {
+                .name           = "mvme16x-scsi",
+                .owner          = THIS_MODULE,
+        },
+        .probe          = mvme16x_probe,
+        .remove         = __devexit_p(mvme16x_device_remove),
 };
 
 static int __init mvme16x_scsi_init(void)
 {
         int err;
 
-        err = driver_register(&mvme16x_scsi_driver);
+        err = platform_driver_register(&mvme16x_scsi_driver);
         if (err)
                 return err;
 
         mvme16x_scsi_device = platform_device_register_simple("mvme16x-scsi",
                                                               -1, NULL, 0);
         if (IS_ERR(mvme16x_scsi_device)) {
-                driver_unregister(&mvme16x_scsi_driver);
+                platform_driver_unregister(&mvme16x_scsi_driver);
                 return PTR_ERR(mvme16x_scsi_device);
         }
 
@@ -151,7 +154,7 @@ static int __init mvme16x_scsi_init(void)
 static void __exit mvme16x_scsi_exit(void)
 {
         platform_device_unregister(mvme16x_scsi_device);
-        driver_unregister(&mvme16x_scsi_driver);
+        platform_driver_unregister(&mvme16x_scsi_driver);
 }
 
 module_init(mvme16x_scsi_init);
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 5f77417ed585..3ee4eb40abcf 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -533,12 +533,8 @@ fc_host_post_event(struct Scsi_Host *shost, u32 event_number,
         event->event_code = event_code;
         event->event_data = event_data;
 
-        err = nlmsg_multicast(scsi_nl_sock, skb, 0, SCSI_NL_GRP_FC_EVENTS,
-                              GFP_KERNEL);
-        if (err && (err != -ESRCH))     /* filter no recipient errors */
-                /* nlmsg_multicast already kfree_skb'd */
-                goto send_fail;
-
+        nlmsg_multicast(scsi_nl_sock, skb, 0, SCSI_NL_GRP_FC_EVENTS,
+                        GFP_KERNEL);
         return;
 
 send_fail_skb:
@@ -607,12 +603,8 @@ fc_host_post_vendor_event(struct Scsi_Host *shost, u32 event_number,
         event->event_code = FCH_EVT_VENDOR_UNIQUE;
         memcpy(&event->event_data, data_buf, data_len);
 
-        err = nlmsg_multicast(scsi_nl_sock, skb, 0, SCSI_NL_GRP_FC_EVENTS,
-                              GFP_KERNEL);
-        if (err && (err != -ESRCH))     /* filter no recipient errors */
-                /* nlmsg_multicast already kfree_skb'd */
-                goto send_vendor_fail;
-
+        nlmsg_multicast(scsi_nl_sock, skb, 0, SCSI_NL_GRP_FC_EVENTS,
+                        GFP_KERNEL);
         return;
 
 send_vendor_fail_skb:
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 75c9297694cb..2adfab8c11c1 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -966,15 +966,7 @@ iscsi_if_transport_lookup(struct iscsi_transport *tt)
 static int
 iscsi_broadcast_skb(struct sk_buff *skb, gfp_t gfp)
 {
-        int rc;
-
-        rc = netlink_broadcast(nls, skb, 0, 1, gfp);
-        if (rc < 0) {
-                printk(KERN_ERR "iscsi: can not broadcast skb (%d)\n", rc);
-                return rc;
-        }
-
-        return 0;
+        return netlink_broadcast(nls, skb, 0, 1, gfp);
 }
 
 static int
@@ -1207,7 +1199,7 @@ int iscsi_session_event(struct iscsi_cls_session *session,
          * the user and when the daemon is restarted it will handle it
          */
         rc = iscsi_broadcast_skb(skb, GFP_KERNEL);
-        if (rc < 0)
+        if (rc == -ESRCH)
                 iscsi_cls_session_printk(KERN_ERR, session,
                                          "Cannot notify userspace of session "
                                          "event %u. Check iscsi daemon\n",
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 516925d8b570..b4ef2f84ea32 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1154,7 +1154,6 @@ sg_poll(struct file *filp, poll_table * wait)
 static int
 sg_fasync(int fd, struct file *filp, int mode)
 {
-        int retval;
         Sg_device *sdp;
         Sg_fd *sfp;
 
@@ -1163,8 +1162,7 @@ sg_fasync(int fd, struct file *filp, int mode)
         SCSI_LOG_TIMEOUT(3, printk("sg_fasync: %s, mode=%d\n",
                                    sdp->disk->disk_name, mode));
 
-        retval = fasync_helper(fd, filp, mode, &sfp->async_qp);
-        return (retval < 0) ? retval : 0;
+        return fasync_helper(fd, filp, mode, &sfp->async_qp);
 }
 
 static int