Split out per-device pci probing and put it under proper CONFIG_PCI.
Signed-off-by: Christoph Hellwig <[EMAIL PROTECTED]>
Index: linux-2.6/drivers/scsi/gdth.c
===
--- linux-2.6.orig/drivers/scsi/gdth.c 2007-07-21 12:17:57.0 +0200
+++ linux-2.6/drivers/scsi/gdth.c 2007-07-21 12:19:13.0 +0200
@@ -482,6 +482,9 @@ static int gdth_isa_probe_one(struct scs
#ifdef CONFIG_EISA
static int gdth_eisa_probe_one(struct scsi_host_template *, ushort);
#endif
+#ifdef CONFIG_PCI
+static int gdth_pci_probe_one(struct scsi_host_template *, gdth_pci_str *,
int);
+#endif
#ifdef DEBUG_GDTH
static unchar DebugState = DEBUG_GDTH;
@@ -4290,12 +4293,10 @@ static int __init gdth_detect(struct scs
static int __init gdth_detect(Scsi_Host_Template *shtp)
#endif
{
-struct Scsi_Host *shp;
gdth_pci_str pcistr[MAXHA];
-gdth_ha_str *ha;
ulong32 isa_bios;
ushort eisa_slot;
-int i,hanum,cnt,ctr,err;
+int cnt,ctr;
unchar b;
@@ -4347,143 +4348,17 @@ static int __init gdth_detect(Scsi_Host_
}
#endif
+#ifdef CONFIG_PCI
/* scanning for PCI controllers */
cnt = gdth_search_pci(pcistr);
printk("GDT-HA: Found %d PCI Storage RAID Controllers\n",cnt);
gdth_sort_pci(pcistr,cnt);
for (ctr = 0; ctr < cnt; ++ctr) {
-dma_addr_t scratch_dma_handle;
-scratch_dma_handle = 0;
-
-if (gdth_ctr_count >= MAXHA)
-break;
-shp = scsi_register(shtp,sizeof(gdth_ext_str));
-if (shp == NULL)
-continue;
-
-ha = HADATA(shp);
-if (!gdth_init_pci(&pcistr[ctr],ha)) {
-scsi_unregister(shp);
-continue;
-}
-/* controller found and initialized */
-printk("Configuring GDT-PCI HA at %d/%d IRQ %u\n",
- pcistr[ctr].pdev->bus->number,
- PCI_SLOT(pcistr[ctr].pdev->devfn), ha->irq);
-
-if (request_irq(ha->irq, gdth_interrupt,
-IRQF_DISABLED|IRQF_SHARED, "gdth", ha))
-{
-printk("GDT-PCI: Unable to allocate IRQ\n");
-scsi_unregister(shp);
-continue;
-}
-shp->unchecked_isa_dma = 0;
-shp->irq = ha->irq;
-shp->dma_channel = 0xff;
-hanum = gdth_ctr_count;
-gdth_ctr_tab[gdth_ctr_count++] = shp;
-gdth_ctr_vtab[gdth_ctr_vcount++] = shp;
-
-NUMDATA(shp)->hanum = (ushort)hanum;
-NUMDATA(shp)->busnum= 0;
-
-ha->pccb = CMDDATA(shp);
-ha->ccb_phys = 0L;
-
-ha->pscratch = pci_alloc_consistent(ha->pdev, GDTH_SCRATCH,
-&scratch_dma_handle);
-ha->scratch_phys = scratch_dma_handle;
-ha->pmsg = pci_alloc_consistent(ha->pdev, sizeof(gdth_msg_str),
-&scratch_dma_handle);
-ha->msg_phys = scratch_dma_handle;
-#ifdef INT_COAL
-ha->coal_stat = (gdth_coal_status *)
-pci_alloc_consistent(ha->pdev, sizeof(gdth_coal_status) *
- MAXOFFSETS, &scratch_dma_handle);
-ha->coal_stat_phys = scratch_dma_handle;
-#endif
-ha->scratch_busy = FALSE;
-ha->req_first = NULL;
-ha->tid_cnt = pcistr[ctr].pdev->device >= 0x200 ? MAXID : MAX_HDRIVES;
-if (max_ids > 0 && max_ids < ha->tid_cnt)
-ha->tid_cnt = max_ids;
-for (i=0; icmd_tab[i].cmnd = UNUSED_CMND;
-ha->scan_mode = rescan ? 0x10 : 0;
-
-err = FALSE;
-if (ha->pscratch == NULL || ha->pmsg == NULL ||
-!gdth_search_drives(hanum)) {
-err = TRUE;
-} else {
-if (hdr_channel < 0 || hdr_channel > ha->bus_cnt)
-hdr_channel = ha->bus_cnt;
-ha->virt_bus = hdr_channel;
-
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-scsi_set_pci_device(shp, pcistr[ctr].pdev);
-#endif
-if (!(ha->cache_feat & ha->raw_feat & ha->screen_feat &GDT_64BIT)||
-/* 64-bit DMA only supported from FW >= x.43 */
-(!ha->dma64_support)) {
-if (pci_set_dma_mask(pcistr[ctr].pdev, DMA_32BIT_MASK)) {
-printk(KERN_WARNING "GDT-PCI %d: Unable to set 32-bit
DMA\n", hanum);
-err = TRUE;
-}
-} else {
-shp->max_cmd_len = 16;
-if (!pci_set_dma_mask(pcistr[ctr].pdev, DMA_64BIT_MASK)) {
-printk("GDT-PCI %d: 64-bit DMA enabled\n", hanum);
-} else if (pci_set_dma_mask(pcistr[ctr].pdev, DMA_32BIT_MASK))
{
-printk(KERN_WARNING "GDT-PCI %d: Unable to set 64/32-bit
DMA\n", hanum);
-err = TRUE;
-}
-}
-}
-
-if (err) {
-printk("GDT-PCI %d: Error during device scan\n", hanum);
---gdth_ctr_count;
---gdt
