From: Jeff Garzik <jeff@garzik.org>
To: Andrew Morton <akpm@linux-foundation.org>, linux-scsi@vger.kernel.org
Cc: LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 5/5] SCSI/initio conversion to PCI driver API
Date: Sun, 27 May 2007 10:59:55 -0400 [thread overview]
Message-ID: <20070527145955.GE17085@havoc.gtf.org> (raw)
In-Reply-To: <20070527145200.GA17017@havoc.gtf.org>
Prior simplifications in this patchset now permit a minimal conversion
to the new PCI API.
Further improvements and simplifications are certainly possible; those
should be presented in a separate patchset.
DO NOT APPLY (yet). For feedback (and testers?) only.
3f42ce6a28b81cb057b2304e3aca6e873618a6fd
diff --git a/drivers/scsi/initio.c b/drivers/scsi/initio.c
index 702dcf5..e54449f 100644
--- a/drivers/scsi/initio.c
+++ b/drivers/scsi/initio.c
@@ -242,6 +242,7 @@ static void tul_read_eeprom(WORD CurBase);
/* ---- INTERNAL VARIABLES ---- */
static HCS tul_hcs[MAX_SUPPORTED_ADAPTERS];
static INI_ADPT_STRUCT i91u_adpt[MAX_SUPPORTED_ADAPTERS];
+static int i91u_adpt_count;
/*NVRAM nvram, *nvramp = &nvram; */
static NVRAM i91unvram;
@@ -2769,26 +2770,13 @@ static int tul_pci_dev_init(struct pci_dev *pDev)
if (rc)
return -ENODEV;
+ i91u_adpt_count++;
return 0;
}
static int tul_NewReturnNumberOfAdapters(void)
{
- struct pci_dev *pDev = NULL; /* Start from none */
- int iAdapters = 0;
- int i;
-
- init_i91uAdapter_table();
-
- for (i = 0; i < ARRAY_SIZE(i91u_pci_devices); i++)
- {
- while ((pDev = pci_find_device(i91u_pci_devices[i].vendor, i91u_pci_devices[i].device, pDev)) != NULL) {
- if (tul_pci_dev_init(pDev) == 0)
- iAdapters++;
- }
- }
-
- return iAdapters;
+ return i91u_adpt_count;
}
static int i91u_detect(struct scsi_host_template * tpnt)
@@ -2843,7 +2831,7 @@ static int i91u_detect(struct scsi_host_template * tpnt)
request_region(pHCB->HCS_Base, 256, "i91u"); /* Register */
pHCB->HCS_Index = i; /* 7/29/98 */
- hreg = scsi_register(tpnt, sizeof(HCS));
+ hreg = scsi_host_alloc(tpnt, sizeof(HCS));
if(hreg == NULL) {
release_region(pHCB->HCS_Base, 256);
return 0;
@@ -2865,8 +2853,21 @@ static int i91u_detect(struct scsi_host_template * tpnt)
if (ok < 0) {
printk(KERN_ERR "i91u: unable to request IRQ %d\n\n",
pHCB->pci_dev->irq);
+ scsi_host_put(hreg);
+ release_region(pHCB->HCS_Base, 256);
+ return 0;
+ }
+
+ if (scsi_add_host(hreg, &pHCB->pci_dev->dev)) {
+ free_irq(pHCB->pci_dev->irq, hreg);
+ scsi_host_put(hreg);
+ release_region(pHCB->HCS_Base, 256);
return 0;
}
+
+ scsi_scan_host(hreg);
+
+ pci_set_drvdata(pHCB->pci_dev, hreg);
}
tpnt->this_id = -1;
@@ -3138,22 +3139,11 @@ static void i91uSCBPost(BYTE * pHcb, BYTE * pScb)
tul_release_scb(pHCB, pSCB); /* Release SCB for current channel */
}
-/*
- * Release ressources
- */
-static int i91u_release(struct Scsi_Host *hreg)
-{
- free_irq(hreg->irq, hreg);
- release_region(hreg->io_port, 256);
- return 0;
-}
MODULE_LICENSE("Dual BSD/GPL");
static struct scsi_host_template driver_template = {
.proc_name = "INI9100U",
.name = i91u_REVID,
- .detect = i91u_detect,
- .release = i91u_release,
.queuecommand = i91u_queuecommand,
// .abort = i91u_abort,
// .reset = i91u_reset,
@@ -3165,5 +3155,54 @@ static struct scsi_host_template driver_template = {
.cmd_per_lun = 1,
.use_clustering = ENABLE_CLUSTERING,
};
-#include "scsi_module.c"
+static int __devinit i91u_pci_probe(struct pci_dev *pdev,
+ const struct pci_device_id *ent)
+{
+ return tul_pci_dev_init(pdev);
+}
+
+static void __devexit i91u_pci_remove(struct pci_dev *pdev)
+{
+ struct Scsi_Host *hreg = pci_get_drvdata(pdev);
+
+ scsi_remove_host(hreg);
+ free_irq(hreg->irq, hreg);
+ release_region(hreg->io_port, 256);
+ scsi_host_put(hreg);
+ pci_set_drvdata(pdev, NULL);
+ pci_disable_device(pdev);
+}
+
+static struct pci_driver i91u_pci_driver = {
+ .name = "initio",
+ .id_table = i91u_pci_devices,
+ .probe = i91u_pci_probe,
+ .remove = i91u_pci_remove,
+};
+
+static int __init i91u_init(void)
+{
+ int rc;
+
+ init_i91uAdapter_table();
+
+ rc = pci_register_driver(&i91u_pci_driver);
+ if (rc)
+ return rc;
+
+ if (!i91u_detect(&driver_template)) {
+ pci_unregister_driver(&i91u_pci_driver);
+ return -ENODEV;
+ }
+
+ return 0;
+}
+
+static void __exit i91u_exit(void)
+{
+ pci_unregister_driver(&i91u_pci_driver);
+}
+
+module_init(i91u_init);
+module_exit(i91u_exit);
next prev parent reply other threads:[~2007-05-27 15:00 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-27 14:52 [PATCH 0/5] SCSI/initio fixes, cleanups, PCI API support Jeff Garzik
2007-05-27 14:53 ` [PATCH 1/5] SCSI/initio PCI DMA fix Jeff Garzik
2007-05-27 14:55 ` [PATCH 2/5] SCSI/initio pci_dev, pci_dev->irq simplifications Jeff Garzik
2007-05-27 14:57 ` [PATCH 3/5] SCSI/initio minor cleanups Jeff Garzik
2007-05-27 14:58 ` [PATCH 4/5] SCSI/initio PCI dev init factorization Jeff Garzik
2007-05-27 14:59 ` Jeff Garzik [this message]
2007-05-27 15:03 ` [PATCH 5/5] SCSI/initio conversion to PCI driver API Jeff Garzik
2007-05-27 15:12 ` James Bottomley
2007-05-27 15:45 ` Jeff Garzik
2007-05-27 15:48 ` Alan Cox
2007-05-27 15:47 ` [PATCH 0/5] SCSI/initio fixes, cleanups, PCI API support Alan Cox
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070527145955.GE17085@havoc.gtf.org \
--to=jeff@garzik.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®