From 07bc1c680c0afd5f7d48289c934f2b8a1fa05660 Mon Sep 17 00:00:00 2001 From: James Bottomley Date: Sat, 16 Aug 2003 11:44:20 -0500 Subject: [PATCH] remove generic device name field from parisc SCSI devices zalon and lasi700 still use this; replace it with bus_id. --- drivers/scsi/lasi700.c | 10 +++------- drivers/scsi/zalon.c | 6 ++---- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/drivers/scsi/lasi700.c b/drivers/scsi/lasi700.c index 25cff061f4a1e..3fabd0618de00 100644 --- 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 05700528818b8..769ca36b8a3d4 100644 --- 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; } -- 2.53.0