aboutsummaryrefslogtreecommitdiff
path: root/drivers/scsi/zalon.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/zalon.c')
-rw-r--r--drivers/scsi/zalon.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/zalon.c b/drivers/scsi/zalon.c
index 3c4a300494a..97ccb038353 100644
--- a/drivers/scsi/zalon.c
+++ b/drivers/scsi/zalon.c
@@ -134,11 +134,11 @@ zalon_probe(struct parisc_device *dev)
host = ncr_attach(&zalon7xx_template, unit, &device);
if (!host)
- goto fail;
+ return -ENODEV;
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->dev, "irq problem with %d, detaching\n ",
+ dev->irq);
goto fail;
}
@@ -182,7 +182,7 @@ static struct parisc_driver zalon_driver = {
.name = "zalon",
.id_table = zalon_tbl,
.probe = zalon_probe,
- .remove = __devexit_p(zalon_remove),
+ .remove = zalon_remove,
};
static int __init zalon7xx_init(void)