USB: usbmon: fix bug in mon_buff_area_shrink

[safe/jmp/linux-2.6] / drivers / scsi / sni_53c710.c

diff --git a/drivers/scsi/sni_53c710.c b/drivers/scsi/sni_53c710.c
index 6bc5051..37b3359 100644 (file)
--- a/drivers/scsi/sni_53c710.c
+++ b/drivers/scsi/sni_53c710.c
@@ -53,6 +53,7 @@
 MODULE_AUTHOR("Thomas Bogendörfer");
 MODULE_DESCRIPTION("SNI RM 53c710 SCSI Driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:snirm_53c710");
 
 #define SNIRM710_CLOCK 32
 
@@ -77,14 +78,13 @@ static int __init snirm710_probe(struct platform_device *dev)
        base = res->start;
        hostdata = kzalloc(sizeof(*hostdata), GFP_KERNEL);
        if (!hostdata) {
-               printk(KERN_ERR "%s: Failed to allocate host data\n",
-                      dev->dev.bus_id);
+               dev_printk(KERN_ERR, dev, "Failed to allocate host data\n");
                return -ENOMEM;
        }
 
        hostdata->dev = &dev->dev;
-       dma_set_mask(&dev->dev, DMA_32BIT_MASK);
-       hostdata->base = ioremap_nocache(CPHYSADDR(base), 0x100);
+       dma_set_mask(&dev->dev, DMA_BIT_MASK(32));
+       hostdata->base = ioremap_nocache(base, 0x100);
        hostdata->differential = 0;
 
        hostdata->clock = SNIRM710_CLOCK;
@@ -98,7 +98,7 @@ static int __init snirm710_probe(struct platform_device *dev)
        host->this_id = 7;
        host->base = base;
        host->irq = platform_get_irq(dev, 0);
-       if(request_irq(host->irq, NCR_700_intr, SA_SHIRQ, "snirm710", host)) {
+       if(request_irq(host->irq, NCR_700_intr, IRQF_SHARED, "snirm710", host)) {
                printk(KERN_ERR "snirm710: request_irq failed!\n");
                goto out_put_host;
        }
@@ -136,18 +136,13 @@ static struct platform_driver snirm710_driver = {
        .remove = __devexit_p(snirm710_driver_remove),
        .driver = {
                .name   = "snirm_53c710",
+               .owner  = THIS_MODULE,
        },
 };
 
 static int __init snirm710_init(void)
 {
-       int err;
-
-       if ((err = platform_driver_register(&snirm710_driver))) {
-               printk(KERN_ERR "Driver registration failed\n");
-               return err;
-       }
-       return 0;
+       return platform_driver_register(&snirm710_driver);
 }
 
 static void __exit snirm710_exit(void)