iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scsi: hpsa: Remove 'hpsa_allow_any' module option

Browse Source 
As the cciss driver has been removed there are no overlapping
PCI IDs anymore, and the 'hpsa_allow_any' flag can be removed.

Signed-off-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Hannes Reinecke 2017-08-15 08:58:09 +02:00 committed by Martin K. Petersen
parent 253d2464df
commit c8cd71f1f3
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/scsi/hpsa.c
View File

@ -83,10 +83,6 @@ MODULE_VERSION(HPSA_DRIVER_VERSION);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("cciss"); MODULE_ALIAS("cciss");
static int hpsa_allow_any;
module_param(hpsa_allow_any, int, S_IRUGO|S_IWUSR);
MODULE_PARM_DESC(hpsa_allow_any,
"Allow hpsa driver to access unknown HP Smart Array hardware");
static int hpsa_simple_mode; static int hpsa_simple_mode;
module_param(hpsa_simple_mode, int, S_IRUGO|S_IWUSR); module_param(hpsa_simple_mode, int, S_IRUGO|S_IWUSR);
MODULE_PARM_DESC(hpsa_simple_mode, MODULE_PARM_DESC(hpsa_simple_mode,
@ -7299,23 +7295,15 @@ static int hpsa_lookup_board_id(struct pci_dev *pdev, u32 *board_id,
if (products[i].access != &SA5A_access && if (products[i].access != &SA5A_access &&
products[i].access != &SA5B_access) products[i].access != &SA5B_access)
return i; return i;
if (hpsa_allow_any) { dev_warn(&pdev->dev,
dev_warn(&pdev->dev, "legacy board ID: 0x%08x\n",
"legacy board ID: 0x%08x\n", *board_id);
*board_id); if (legacy_board)
if (legacy_board) *legacy_board = true;
*legacy_board = true; return i;
return i;
}
} }
if ((subsystem_vendor_id != PCI_VENDOR_ID_HP && dev_warn(&pdev->dev, "unrecognized board ID: 0x%08x\n", *board_id);
subsystem_vendor_id != PCI_VENDOR_ID_COMPAQ) ||
!hpsa_allow_any) {
dev_warn(&pdev->dev, "unrecognized board ID: "
"0x%08x, ignoring.\n", *board_id);
return -ENODEV;
}
if (legacy_board) if (legacy_board)
*legacy_board = true; *legacy_board = true;
return ARRAY_SIZE(products) - 1; /* generic unknown smart array */ return ARRAY_SIZE(products) - 1; /* generic unknown smart array */