Skip to content

Commit

Permalink
isci: reorder init to cleanup unneeded declarations
Browse files Browse the repository at this point in the history
Just move isci_pci_driver below the function definitions and delete the
declarations.  A couple other whitespace fixups, and unused symbol
deletions.

Reported-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
  • Loading branch information
Dan Williams committed Jul 3, 2011
1 parent 09d7da1 commit f942f32
Showing 1 changed file with 9 additions and 17 deletions.
26 changes: 9 additions & 17 deletions drivers/scsi/isci/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -84,23 +84,8 @@ static DEFINE_PCI_DEVICE_TABLE(isci_id_table) = {
{}
};

struct isci_firmware *isci_firmware;

static int __devinit isci_pci_probe(
struct pci_dev *pdev,
const struct pci_device_id *device_id_p);

static void __devexit isci_pci_remove(struct pci_dev *pdev);

MODULE_DEVICE_TABLE(pci, isci_id_table);

static struct pci_driver isci_pci_driver = {
.name = DRV_NAME,
.id_table = isci_id_table,
.probe = isci_pci_probe,
.remove = __devexit_p(isci_pci_remove),
};

/* linux isci specific settings */

#if defined(CONFIG_PBG_HBA_A0)
Expand Down Expand Up @@ -339,7 +324,7 @@ static int num_controllers(struct pci_dev *pdev)
*/
resource_size_t scu_bar_size = pci_resource_len(pdev, SCI_SCU_BAR*2);
resource_size_t smu_bar_size = pci_resource_len(pdev, SCI_SMU_BAR*2);

if (scu_bar_size >= SCI_SCU_BAR_SIZE*SCI_MAX_CONTROLLERS &&
smu_bar_size >= SCI_SMU_BAR_SIZE*SCI_MAX_CONTROLLERS)
return SCI_MAX_CONTROLLERS;
Expand Down Expand Up @@ -484,7 +469,7 @@ static void check_si_rev(struct pci_dev *pdev)
dev_info(&pdev->dev, "driver configured for %s silicon (rev: %d)\n",
isci_si_rev == ISCI_SI_REVA0 ? "A0" :
isci_si_rev == ISCI_SI_REVA2 ? "A2" : "B0", pdev->revision);

}

static int __devinit isci_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
Expand Down Expand Up @@ -573,6 +558,13 @@ static void __devexit isci_pci_remove(struct pci_dev *pdev)
}
}

static struct pci_driver isci_pci_driver = {
.name = DRV_NAME,
.id_table = isci_id_table,
.probe = isci_pci_probe,
.remove = __devexit_p(isci_pci_remove),
};

static __init int isci_init(void)
{
int err;
Expand Down

0 comments on commit f942f32

Please sign in to comment.