config: tegra3: enable /dev mount with ACL
[linux-2.6.git] / drivers / scsi / mvme16x_scsi.c
index b264b49..39f554f 100644 (file)
@@ -12,6 +12,7 @@
 #include <linux/platform_device.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/slab.h>
 #include <asm/mvme16xhw.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_device.h>
@@ -34,7 +35,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 +65,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 +90,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 +104,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 +125,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 +155,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);