Commit 07bc1c68 authored by James Bottomley's avatar James Bottomley

remove generic device name field from parisc SCSI devices

zalon and lasi700 still use this; replace it with bus_id.
parent 44b4ad44
...@@ -86,14 +86,10 @@ lasi700_driver_callback(struct parisc_device *dev) ...@@ -86,14 +86,10 @@ lasi700_driver_callback(struct parisc_device *dev)
struct NCR_700_Host_Parameters *hostdata; struct NCR_700_Host_Parameters *hostdata;
struct Scsi_Host *host; 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); hostdata = kmalloc(sizeof(*hostdata), GFP_KERNEL);
if (!hostdata) { if (!hostdata) {
printk(KERN_ERR "%s: Failed to allocate host data\n", printk(KERN_ERR "%s: Failed to allocate host data\n",
dev->dev.name); dev->dev.bus_id);
return 1; return 1;
} }
memset(hostdata, 0, sizeof(struct NCR_700_Host_Parameters)); memset(hostdata, 0, sizeof(struct NCR_700_Host_Parameters));
...@@ -121,9 +117,9 @@ lasi700_driver_callback(struct parisc_device *dev) ...@@ -121,9 +117,9 @@ lasi700_driver_callback(struct parisc_device *dev)
host->irq = dev->irq; host->irq = dev->irq;
if (request_irq(dev->irq, NCR_700_intr, SA_SHIRQ, 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", printk(KERN_ERR "%s: irq problem, detaching\n",
dev->dev.name); dev->dev.bus_id);
goto out_put_host; goto out_put_host;
} }
......
...@@ -135,11 +135,9 @@ zalon_scsi_callback(struct parisc_device *dev) ...@@ -135,11 +135,9 @@ zalon_scsi_callback(struct parisc_device *dev)
if(!host) if(!host)
goto fail; goto fail;
strlcpy(dev->dev.name, "zalon7xx", sizeof(dev->dev.name)); if(request_irq(irq, ncr53c8xx_intr, SA_SHIRQ, dev->dev.bus_id, host)) {
if(request_irq(irq, ncr53c8xx_intr, SA_SHIRQ, dev->dev.name, host)) {
printk(KERN_ERR "%s: irq problem with %d, detaching\n ", printk(KERN_ERR "%s: irq problem with %d, detaching\n ",
dev->dev.name, irq); dev->dev.bus_id, irq);
goto fail; goto fail;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment