remove generic device name field from parisc SCSI devices

zalon and lasi700 still use this; replace it with bus_id.

diff --git a/drivers/scsi/lasi700.c b/drivers/scsi/lasi700.c
index 25cff061f4a1ecfd234d6044503aef3d113db4b1..3fabd0618de00843e472aa99d16595bda8545c08 100644 (file)
--- a/drivers/scsi/lasi700.c
+++ b/drivers/scsi/lasi700.c
@@ -86,14 +86,10 @@ lasi700_driver_callback(struct parisc_device *dev)
        struct NCR_700_Host_Parameters *hostdata;
        struct Scsi_Host *host;
 
-       snprintf(dev->dev.name, sizeof(dev->dev.name), "%s",
-                (dev->id.sversion == LASI_700_SVERSION) ?
-                 "lasi700" : "lasi710");
-
        hostdata = kmalloc(sizeof(*hostdata), GFP_KERNEL);
        if (!hostdata) {
                printk(KERN_ERR "%s: Failed to allocate host data\n",
-                      dev->dev.name);
+                      dev->dev.bus_id);
                return 1;
        }
        memset(hostdata, 0, sizeof(struct NCR_700_Host_Parameters));
@@ -121,9 +117,9 @@ lasi700_driver_callback(struct parisc_device *dev)
 
        host->irq = dev->irq;
        if (request_irq(dev->irq, NCR_700_intr, SA_SHIRQ,
-                               dev->dev.name, host)) {
+                               dev->dev.bus_id, host)) {
                printk(KERN_ERR "%s: irq problem, detaching\n",
-                      dev->dev.name);
+                      dev->dev.bus_id);
                goto out_put_host;
        }
 

diff --git a/drivers/scsi/zalon.c b/drivers/scsi/zalon.c
index 05700528818b80e3f3eba5cde0ec25935843a452..769ca36b8a3d4fe371fdfdcadc579cb610d1e541 100644 (file)
--- a/drivers/scsi/zalon.c
+++ b/drivers/scsi/zalon.c
@@ -135,11 +135,9 @@ zalon_scsi_callback(struct parisc_device *dev)
        if(!host)
                goto fail;
 
-       strlcpy(dev->dev.name, "zalon7xx", sizeof(dev->dev.name));
-
-       if(request_irq(irq, ncr53c8xx_intr, SA_SHIRQ, dev->dev.name, host)) {
+       if(request_irq(irq, ncr53c8xx_intr, SA_SHIRQ, dev->dev.bus_id, host)) {
                printk(KERN_ERR "%s: irq problem with %d, detaching\n ",
-                      dev->dev.name, irq);
+                      dev->dev.bus_id, irq);
                goto fail;
        }