scsi: esp_scsi: remove the dev argument to scsi_esp_register

We can simplify use esp->dev now.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Tested-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/am53c974.c b/drivers/scsi/am53c974.c
index 3890ea5cd4a6717e7d4ed0638038384abb6c073f..75ac065ef49e534f057eeda05115c743e6e9aa02 100644 (file)
--- a/drivers/scsi/am53c974.c
+++ b/drivers/scsi/am53c974.c
@@ -496,7 +496,7 @@ static int pci_esp_probe_one(struct pci_dev *pdev,
        /* Assume 40MHz clock */
        esp->cfreq = 40000000;
 
-       err = scsi_esp_register(esp, &pdev->dev);
+       err = scsi_esp_register(esp);
        if (err)
                goto fail_free_irq;
 

diff --git a/drivers/scsi/esp_scsi.c b/drivers/scsi/esp_scsi.c
index c3fc34b9964df75a610dd70a74bd1ca23ee147b8..90604bff8dd24ef26a2916a2e316a9b4156d584e 100644 (file)
--- a/drivers/scsi/esp_scsi.c
+++ b/drivers/scsi/esp_scsi.c
@@ -2382,7 +2382,7 @@ static const char *esp_chip_names[] = {
 
 static struct scsi_transport_template *esp_transport_template;
 
-int scsi_esp_register(struct esp *esp, struct device *dev)
+int scsi_esp_register(struct esp *esp)
 {
        static int instance;
        int err;
@@ -2402,10 +2402,10 @@ int scsi_esp_register(struct esp *esp, struct device *dev)
 
        esp_bootup_reset(esp);
 
-       dev_printk(KERN_INFO, dev, "esp%u: regs[%1p:%1p] irq[%u]\n",
+       dev_printk(KERN_INFO, esp->dev, "esp%u: regs[%1p:%1p] irq[%u]\n",
                   esp->host->unique_id, esp->regs, esp->dma_regs,
                   esp->host->irq);
-       dev_printk(KERN_INFO, dev,
+       dev_printk(KERN_INFO, esp->dev,
                   "esp%u: is a %s, %u MHz (ccf=%u), SCSI ID %u\n",
                   esp->host->unique_id, esp_chip_names[esp->rev],
                   esp->cfreq / 1000000, esp->cfact, esp->scsi_id);
@@ -2413,7 +2413,7 @@ int scsi_esp_register(struct esp *esp, struct device *dev)
        /* Let the SCSI bus reset settle. */
        ssleep(esp_bus_reset_settle);
 
-       err = scsi_add_host(esp->host, dev);
+       err = scsi_add_host(esp->host, esp->dev);
        if (err)
                return err;
 

diff --git a/drivers/scsi/esp_scsi.h b/drivers/scsi/esp_scsi.h
index f98abd0ead57302023b3bd9da29e5e39c6fcf1ea..b27cf5e2b4b64f73c36054cc6bc04416af891dc7 100644 (file)
--- a/drivers/scsi/esp_scsi.h
+++ b/drivers/scsi/esp_scsi.h
@@ -568,13 +568,12 @@ struct esp {
  *     example, the DMA engine has to be reset before ESP can
  *     be programmed.
  * 11) If necessary, call dev_set_drvdata() as needed.
- * 12) Call scsi_esp_register() with prepared 'esp' structure
- *     and a device pointer if possible.
+ * 12) Call scsi_esp_register() with prepared 'esp' structure.
  * 13) Check scsi_esp_register() return value, release all resources
  *     if an error was returned.
  */
 extern struct scsi_host_template scsi_esp_template;
-extern int scsi_esp_register(struct esp *, struct device *);
+extern int scsi_esp_register(struct esp *);
 
 extern void scsi_esp_unregister(struct esp *);
 extern irqreturn_t scsi_esp_intr(int, void *);

diff --git a/drivers/scsi/jazz_esp.c b/drivers/scsi/jazz_esp.c
index 6eb5ff3e2e611b042a1f101980445edcba43a496..8f4f5c28b0dd7a81885d5b4d85ce4e2a36bb2fec 100644 (file)
--- a/drivers/scsi/jazz_esp.c
+++ b/drivers/scsi/jazz_esp.c
@@ -182,7 +182,7 @@ static int esp_jazz_probe(struct platform_device *dev)
 
        dev_set_drvdata(&dev->dev, esp);
 
-       err = scsi_esp_register(esp, &dev->dev);
+       err = scsi_esp_register(esp);
        if (err)
                goto fail_free_irq;
 

diff --git a/drivers/scsi/mac_esp.c b/drivers/scsi/mac_esp.c
index 85d067889a9b80e97258fc7b5e8414a0212239e4..9299ff929f7f973588d73e28b7a759976f2e8cca 100644 (file)
--- a/drivers/scsi/mac_esp.c
+++ b/drivers/scsi/mac_esp.c
@@ -576,7 +576,7 @@ static int esp_mac_probe(struct platform_device *dev)
        esp_chips[dev->id] = esp;
        spin_unlock(&esp_chips_lock);
 
-       err = scsi_esp_register(esp, &dev->dev);
+       err = scsi_esp_register(esp);
        if (err)
                goto fail_free_irq;
 

diff --git a/drivers/scsi/sun3x_esp.c b/drivers/scsi/sun3x_esp.c
index 0b1421cdf8a0e433a2124463c85fc410f15b1389..e80c0a15fd8a74d1eeaef3ad956bcbba6d162e32 100644 (file)
--- a/drivers/scsi/sun3x_esp.c
+++ b/drivers/scsi/sun3x_esp.c
@@ -246,7 +246,7 @@ static int esp_sun3x_probe(struct platform_device *dev)
 
        dev_set_drvdata(&dev->dev, esp);
 
-       err = scsi_esp_register(esp, &dev->dev);
+       err = scsi_esp_register(esp);
        if (err)
                goto fail_free_irq;
 

diff --git a/drivers/scsi/sun_esp.c b/drivers/scsi/sun_esp.c
index 91577ceb4cba4f9412f1935b06e2a9f0b745d460..64e6d34e436479dad97bf2c0de6e5d8eb2d1daa4 100644 (file)
--- a/drivers/scsi/sun_esp.c
+++ b/drivers/scsi/sun_esp.c
@@ -529,7 +529,7 @@ static int esp_sbus_probe_one(struct platform_device *op,
 
        dev_set_drvdata(&op->dev, esp);
 
-       err = scsi_esp_register(esp, &op->dev);
+       err = scsi_esp_register(esp);
        if (err)
                goto fail_free_irq;
 

diff --git a/drivers/scsi/zorro_esp.c b/drivers/scsi/zorro_esp.c
index bb70882e6b56e0bd4f1d37e367e205bbb16f19ac..274a873bd2d51974118fbac8cc5586e2353841ac 100644 (file)
--- a/drivers/scsi/zorro_esp.c
+++ b/drivers/scsi/zorro_esp.c
@@ -1082,7 +1082,7 @@ static int zorro_esp_probe(struct zorro_dev *z,
        }
 
        /* register the chip */
-       err = scsi_esp_register(esp, &z->dev);
+       err = scsi_esp_register(esp);
 
        if (err) {
                err = -ENOMEM;