From: Matthew Wilcox <matthew@wil.cx>
To: linux-scsi@vger.kernel.org
Cc: Matthew Wilcox <matthew@wil.cx>
Subject: [PATCH 3/4] advansys: Convert to pci_register_driver interface
Date: Mon, 16 Jul 2007 16:41:51 -0600 [thread overview]
Message-ID: <1184625713127-git-send-email-matthew@wil.cx> (raw)
In-Reply-To: <11846257131961-git-send-email-matthew@wil.cx>
In-Reply-To: <20070716202815.GQ13826@parisc-linux.org>
Add a pci_driver interface for the PCI advansys devices. For
ISA/EISA/VLB devices, we still call advansys_detect and advansys_release.
Signed-off-by: Matthew Wilcox <matthew@wil.cx>
---
drivers/scsi/advansys.c | 170 +++++++++++++++++++++--------------------------
1 files changed, 75 insertions(+), 95 deletions(-)
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index 83fd9c7..35c4a1d 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -4261,12 +4261,12 @@ advansys_proc_info(struct Scsi_Host *shost, char *buffer, char **start,
static int advansys_board_found(struct scsi_host_template *tpnt, int iop,
struct pci_dev *pdev, int bus_type)
{
- struct Scsi_Host *shp = NULL;
- asc_board_t *boardp = NULL;
+ struct Scsi_Host *shp;
+ asc_board_t *boardp;
ASC_DVC_VAR *asc_dvc_varp = NULL;
ADV_DVC_VAR *adv_dvc_varp = NULL;
- adv_sgblk_t *sgp = NULL;
- int share_irq = FALSE;
+ adv_sgblk_t *sgp;
+ int share_irq;
int iolen = 0;
ADV_PADDR pci_memory_address;
int warn_code, err_code;
@@ -4284,6 +4284,8 @@ static int advansys_board_found(struct scsi_host_template *tpnt, int iop,
/* Save a pointer to the Scsi_Host of each board found. */
asc_host[asc_board_count++] = shp;
+ if (pdev)
+ pci_set_drvdata(pdev, shp);
/* Initialize private per board data */
boardp = ASC_BOARDP(shp);
@@ -5033,9 +5035,8 @@ static int advansys_board_found(struct scsi_host_template *tpnt, int iop,
sgp = (adv_sgblk_t *)
kmalloc(sizeof(adv_sgblk_t), GFP_ATOMIC);
- if (sgp == NULL) {
+ if (sgp == NULL)
break;
- }
sgp->next_sgblkp = boardp->adv_sgblkp;
boardp->adv_sgblkp = sgp;
@@ -5171,24 +5172,6 @@ advansys_detect(struct scsi_host_template *tpnt)
int iop;
int bus;
int ioport = 0;
-#ifdef CONFIG_PCI
- int pci_init_search = 0;
- struct pci_dev *pci_devicep[ASC_NUM_BOARD_SUPPORTED];
- int pci_card_cnt_max = 0;
- int pci_card_cnt = 0;
- struct pci_dev *pci_devp = NULL;
- int pci_device_id_cnt = 0;
- unsigned int pci_device_id[ASC_PCI_DEVICE_ID_CNT] = {
- PCI_DEVICE_ID_ASP_1200A,
- PCI_DEVICE_ID_ASP_ABP940,
- PCI_DEVICE_ID_ASP_ABP940U,
- PCI_DEVICE_ID_ASP_ABP940UW,
- PCI_DEVICE_ID_38C0800_REV1,
- PCI_DEVICE_ID_38C1600_REV1
- };
-#else
-#define pci_devp NULL
-#endif /* CONFIG_PCI */
if (detect_called == ASC_FALSE) {
detect_called = ASC_TRUE;
@@ -5312,70 +5295,6 @@ advansys_detect(struct scsi_host_template *tpnt)
#endif /* CONFIG_ISA */
break;
- case ASC_IS_PCI:
-#ifdef CONFIG_PCI
- if (pci_init_search == 0) {
- int i, j;
-
- pci_init_search = 1;
-
- /* Find all PCI cards. */
- while (pci_device_id_cnt < ASC_PCI_DEVICE_ID_CNT) {
- if ((pci_devp = pci_find_device(PCI_VENDOR_ID_ASP,
- pci_device_id[pci_device_id_cnt], pci_devp)) ==
- NULL) {
- pci_device_id_cnt++;
- } else {
- if (pci_enable_device(pci_devp) == 0) {
- pci_devicep[pci_card_cnt_max++] = pci_devp;
- }
- }
- }
-
- /*
- * Sort PCI cards in ascending order by PCI Bus, Slot,
- * and Device Number.
- */
- for (i = 0; i < pci_card_cnt_max - 1; i++)
- {
- for (j = i + 1; j < pci_card_cnt_max; j++) {
- if ((pci_devicep[j]->bus->number <
- pci_devicep[i]->bus->number) ||
- ((pci_devicep[j]->bus->number ==
- pci_devicep[i]->bus->number) &&
- (pci_devicep[j]->devfn <
- pci_devicep[i]->devfn))) {
- pci_devp = pci_devicep[i];
- pci_devicep[i] = pci_devicep[j];
- pci_devicep[j] = pci_devp;
- }
- }
- }
-
- pci_card_cnt = 0;
- } else {
- pci_card_cnt++;
- }
-
- if (pci_card_cnt == pci_card_cnt_max) {
- iop = 0;
- } else {
- pci_devp = pci_devicep[pci_card_cnt];
-
- ASC_DBG2(2,
- "advansys_detect: devfn %d, bus number %d\n",
- pci_devp->devfn, pci_devp->bus->number);
- iop = pci_resource_start(pci_devp, 0);
- ASC_DBG2(1,
- "advansys_detect: vendorID %X, deviceID %X\n",
- pci_devp->vendor, pci_devp->device);
- ASC_DBG2(2, "advansys_detect: iop %X, irqLine %d\n",
- iop, pci_devp->irq);
- }
-
-#endif /* CONFIG_PCI */
- break;
-
default:
ASC_PRINT1("advansys_detect: unknown bus type: %d\n",
asc_bus[bus]);
@@ -5386,7 +5305,7 @@ advansys_detect(struct scsi_host_template *tpnt)
if (iop == 0)
break;
- advansys_board_found(tpnt, iop, pci_devp, asc_bus[bus]);
+ advansys_board_found(tpnt, iop, NULL, asc_bus[bus]);
}
}
@@ -5855,8 +5774,6 @@ static struct scsi_host_template driver_template = {
.proc_info = advansys_proc_info,
#endif
.name = "advansys",
- .detect = advansys_detect,
- .release = advansys_release,
.info = advansys_info,
.queuecommand = advansys_queuecommand,
.eh_bus_reset_handler = advansys_reset,
@@ -5877,8 +5794,6 @@ static struct scsi_host_template driver_template = {
*/
.use_clustering = ENABLE_CLUSTERING,
};
-#include "scsi_module.c"
-
/*
* --- Miscellaneous Driver Functions
@@ -5911,6 +5826,8 @@ advansys_interrupt(int irq, void *dev_id)
*/
for (i = 0; i < asc_board_count; i++) {
shp = asc_host[i];
+ if (!shp)
+ continue;
boardp = ASC_BOARDP(shp);
ASC_DBG2(2, "advansys_interrupt: i %d, boardp 0x%lx\n",
i, (ulong) boardp);
@@ -18113,7 +18030,6 @@ AdvInquiryHandling(
}
MODULE_LICENSE("Dual BSD/GPL");
-#ifdef CONFIG_PCI
/* PCI Devices supported by this driver */
static struct pci_device_id advansys_pci_tbl[] __devinitdata = {
{ PCI_VENDOR_ID_ASP, PCI_DEVICE_ID_ASP_1200A,
@@ -18131,4 +18047,68 @@ static struct pci_device_id advansys_pci_tbl[] __devinitdata = {
{ }
};
MODULE_DEVICE_TABLE(pci, advansys_pci_tbl);
-#endif /* CONFIG_PCI */
+
+static int __devinit advansys_pci_probe(struct pci_dev *pdev,
+ const struct pci_device_id *ent)
+{
+ int err, ioport;
+
+ ioport = pci_resource_start(pdev, 0);
+ err = advansys_board_found(&driver_template, ioport, pdev, ASC_IS_PCI);
+
+ return err;
+}
+
+static void advansys_pci_remove(struct pci_dev *pdev)
+{
+ int i;
+ struct Scsi_Host *host = pci_get_drvdata(pdev);
+ scsi_remove_host(host);
+ advansys_release(host);
+
+ for (i = 0; i < asc_board_count; i++) {
+ if (asc_host[i] == host) {
+ asc_host[i] = NULL;
+ break;
+ }
+ }
+}
+
+static void advansys_remove(void)
+{
+ int i;
+
+ for (i = 0; i < asc_board_count; i++) {
+ struct Scsi_Host *host = asc_host[i];
+ if (!host)
+ continue;
+ scsi_remove_host(host);
+ advansys_release(host);
+ asc_host[i] = NULL;
+ }
+}
+
+static struct pci_driver advansys_pci_driver = {
+ .name = "advansys",
+ .id_table = advansys_pci_tbl,
+ .probe = advansys_pci_probe,
+ .remove = __devexit_p(advansys_pci_remove),
+};
+
+static int __init advansys_init(void)
+{
+ int error;
+ error = pci_register_driver(&advansys_pci_driver);
+ if (!error)
+ advansys_detect(&driver_template);
+ return error;
+}
+
+static void __exit advansys_exit(void)
+{
+ pci_unregister_driver(&advansys_pci_driver);
+ advansys_remove();
+}
+
+module_init(advansys_init);
+module_exit(advansys_exit);
--
1.4.4.4
next prev parent reply other threads:[~2007-07-17 0:24 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-16 20:28 advansys cleanup Matthew Wilcox
2007-07-16 22:41 ` [PATCH 1/4] advansys: Create advansys_board_found() Matthew Wilcox
2007-07-16 22:41 ` [PATCH 2/4] advansys: Clean up proc_info implementation Matthew Wilcox
2007-07-16 22:41 ` Matthew Wilcox [this message]
2007-07-16 22:41 ` [PATCH 4/4] advansys: Move to scsi hotplug initialisation model Matthew Wilcox
2007-07-17 14:24 ` advansys cleanup Matthew Wilcox
2007-07-17 15:36 ` Ken Witherow
2007-07-17 16:37 ` Matthew Wilcox
2007-07-17 20:05 ` Ken Witherow
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=1184625713127-git-send-email-matthew@wil.cx \
--to=matthew@wil.cx \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.