diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2008-12-03 16:41:36 -0500 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-01-02 11:22:16 -0500 |
commit | 71610f55fa4db63dbf5385929a47c9fb2451f332 (patch) | |
tree | b816672eef25e1436111e6c78053612bd22fb016 /drivers/scsi/NCR_D700.c | |
parent | b58602a4bac012b5f4fc12fe6b46ab237b610d5d (diff) |
[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/NCR_D700.c')
-rw-r--r-- | drivers/scsi/NCR_D700.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/NCR_D700.c b/drivers/scsi/NCR_D700.c index 9e64b21ef637..c889d8458684 100644 --- a/drivers/scsi/NCR_D700.c +++ b/drivers/scsi/NCR_D700.c | |||
@@ -318,7 +318,7 @@ NCR_D700_probe(struct device *dev) | |||
318 | return -ENOMEM; | 318 | return -ENOMEM; |
319 | 319 | ||
320 | p->dev = dev; | 320 | p->dev = dev; |
321 | snprintf(p->name, sizeof(p->name), "D700(%s)", dev->bus_id); | 321 | snprintf(p->name, sizeof(p->name), "D700(%s)", dev_name(dev)); |
322 | if (request_irq(irq, NCR_D700_intr, IRQF_SHARED, p->name, p)) { | 322 | if (request_irq(irq, NCR_D700_intr, IRQF_SHARED, p->name, p)) { |
323 | printk(KERN_ERR "D700: request_irq failed\n"); | 323 | printk(KERN_ERR "D700: request_irq failed\n"); |
324 | kfree(p); | 324 | kfree(p); |