summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/zalon.c
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2008-12-03 22:41:36 +0100
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2009-01-02 10:22:16 -0600
commit71610f55fa4db63dbf5385929a47c9fb2451f332 (patch)
treeb816672eef25e1436111e6c78053612bd22fb016 /drivers/scsi/zalon.c
parentb58602a4bac012b5f4fc12fe6b46ab237b610d5d (diff)
downloadop-kernel-dev-71610f55fa4db63dbf5385929a47c9fb2451f332.zip
op-kernel-dev-71610f55fa4db63dbf5385929a47c9fb2451f332.tar.gz
[SCSI] struct device - replace bus_id with dev_name(), dev_set_name()
[jejb: limit ioctl to returning 20 characters to avoid overrun on long device names and add a few more conversions] Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/zalon.c')
-rw-r--r--drivers/scsi/zalon.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/zalon.c b/drivers/scsi/zalon.c
index 3c4a300..a8d61a6 100644
--- a/drivers/scsi/zalon.c
+++ b/drivers/scsi/zalon.c
@@ -137,8 +137,8 @@ zalon_probe(struct parisc_device *dev)
goto fail;
if (request_irq(dev->irq, ncr53c8xx_intr, IRQF_SHARED, "zalon", host)) {
- printk(KERN_ERR "%s: irq problem with %d, detaching\n ",
- dev->dev.bus_id, dev->irq);
+ dev_printk(KERN_ERR, dev, "irq problem with %d, detaching\n ",
+ dev->irq);
goto fail;
}
OpenPOWER on IntegriCloud