Commit ec5c4a6f authored by Christoph Hellwig's avatar Christoph Hellwig Committed by James Bottomley

[PATCH] tiny zalon cleanups

Rename zalon_scsi_callback to the more sensible zalon_probe and fix
a few tiny indentation issues.
parent 7990f558
...@@ -99,7 +99,7 @@ static Scsi_Host_Template zalon7xx_template = { ...@@ -99,7 +99,7 @@ static Scsi_Host_Template zalon7xx_template = {
}; };
static int __init static int __init
zalon_scsi_callback(struct parisc_device *dev) zalon_probe(struct parisc_device *dev)
{ {
struct gsc_irq gsc_irq; struct gsc_irq gsc_irq;
u32 zalon_vers; u32 zalon_vers;
...@@ -130,7 +130,7 @@ zalon_scsi_callback(struct parisc_device *dev) ...@@ -130,7 +130,7 @@ zalon_scsi_callback(struct parisc_device *dev)
__raw_writel(gsc_irq.txn_addr | gsc_irq.txn_data, dev->hpa + IO_MODULE_EIM); __raw_writel(gsc_irq.txn_addr | gsc_irq.txn_data, dev->hpa + IO_MODULE_EIM);
if ( zalon_vers == 0) if (zalon_vers == 0)
printk(KERN_WARNING "%s: Zalon 1.1 or earlier\n", __FUNCTION__); printk(KERN_WARNING "%s: Zalon 1.1 or earlier\n", __FUNCTION__);
memset(&device, 0, sizeof(ncr_device)); memset(&device, 0, sizeof(ncr_device));
...@@ -150,10 +150,10 @@ zalon_scsi_callback(struct parisc_device *dev) ...@@ -150,10 +150,10 @@ zalon_scsi_callback(struct parisc_device *dev)
device.differential = 2; device.differential = 2;
host = ncr_attach(&zalon7xx_template, unit, &device); host = ncr_attach(&zalon7xx_template, unit, &device);
if(!host) if (!host)
goto fail; goto fail;
if(request_irq(irq, ncr53c8xx_intr, SA_SHIRQ, dev->dev.bus_id, host)) { if (request_irq(irq, ncr53c8xx_intr, SA_SHIRQ, dev->dev.bus_id, host)) {
printk(KERN_ERR "%s: irq problem with %d, detaching\n ", printk(KERN_ERR "%s: irq problem with %d, detaching\n ",
dev->dev.bus_id, irq); dev->dev.bus_id, irq);
goto fail; goto fail;
...@@ -200,7 +200,7 @@ static int __exit zalon_remove(struct parisc_device *dev) ...@@ -200,7 +200,7 @@ static int __exit zalon_remove(struct parisc_device *dev)
static struct parisc_driver zalon_driver = { static struct parisc_driver zalon_driver = {
.name = "GSC SCSI (Zalon)", .name = "GSC SCSI (Zalon)",
.id_table = zalon_tbl, .id_table = zalon_tbl,
.probe = zalon_scsi_callback, .probe = zalon_probe,
.remove = __devexit_p(zalon_remove), .remove = __devexit_p(zalon_remove),
}; };
......
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