Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4205df34 authored by Stephen M. Cameron's avatar Stephen M. Cameron Committed by Jens Axboe
Browse files

cciss: remove controllers supported by hpsa 



We would prefer not to have any overlap between the two drivers.
Remove the cciss_allow_hpsa option, as it it is no longer needed.

Signed-off-by: default avatarStephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 332c2f80

drivers/block/cciss.c

+4 −41
Original line number Diff line number Diff line
@@ -66,11 +66,6 @@ MODULE_VERSION("3.6.26"); 
MODULE_LICENSE("GPL");



static DEFINE_MUTEX(cciss_mutex);

static int cciss_allow_hpsa;

module_param(cciss_allow_hpsa, int, S_IRUGO|S_IWUSR);

MODULE_PARM_DESC(cciss_allow_hpsa,

	"Prevent cciss driver from accessing hardware known to be "

	" supported by the hpsa driver");



#include "cciss_cmd.h"

#include "cciss.h"
@@ -98,19 +93,6 @@ static const struct pci_device_id cciss_pci_device_id[] = { 
	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSD,     0x103C, 0x3215},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSC,     0x103C, 0x3237},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSC,     0x103C, 0x323D},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3241},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3243},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3245},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3247},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3249},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x324A},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x324B},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x3350},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x3351},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x3352},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x3353},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x3354},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x3355},

	{0,}

};
@@ -131,6 +113,8 @@ static struct board_type products[] = { 
	{0x409D0E11, "Smart Array 6400 EM", &SA5_access},

	{0x40910E11, "Smart Array 6i", &SA5_access},

	{0x3225103C, "Smart Array P600", &SA5_access},

	{0x3223103C, "Smart Array P800", &SA5_access},

	{0x3234103C, "Smart Array P400", &SA5_access},

	{0x3235103C, "Smart Array P400i", &SA5_access},

	{0x3211103C, "Smart Array E200i", &SA5_access},

	{0x3212103C, "Smart Array E200", &SA5_access},
@@ -138,24 +122,7 @@ static struct board_type products[] = { 
	{0x3214103C, "Smart Array E200i", &SA5_access},

	{0x3215103C, "Smart Array E200i", &SA5_access},

	{0x3237103C, "Smart Array E500", &SA5_access},

/* controllers below this line are also supported by the hpsa driver. */

#define HPSA_BOUNDARY 0x3223103C

	{0x3223103C, "Smart Array P800", &SA5_access},

	{0x3234103C, "Smart Array P400", &SA5_access},

	{0x323D103C, "Smart Array P700m", &SA5_access},

	{0x3241103C, "Smart Array P212", &SA5_access},

	{0x3243103C, "Smart Array P410", &SA5_access},

	{0x3245103C, "Smart Array P410i", &SA5_access},

	{0x3247103C, "Smart Array P411", &SA5_access},

	{0x3249103C, "Smart Array P812", &SA5_access},

	{0x324A103C, "Smart Array P712m", &SA5_access},

	{0x324B103C, "Smart Array P711m", &SA5_access},

	{0x3350103C, "Smart Array", &SA5_access},

	{0x3351103C, "Smart Array", &SA5_access},

	{0x3352103C, "Smart Array", &SA5_access},

	{0x3353103C, "Smart Array", &SA5_access},

	{0x3354103C, "Smart Array", &SA5_access},

	{0x3355103C, "Smart Array", &SA5_access},

	{0x323d103c, "Smart Array P700M", &SA5_access},

};



/* How long to wait (in milliseconds) for board to go into simple mode */
@@ -3969,13 +3936,9 @@ static int __devinit cciss_lookup_board_id(struct pci_dev *pdev, u32 *board_id) 
	*board_id = ((subsystem_device_id << 16) & 0xffff0000) |

			subsystem_vendor_id;



	for (i = 0; i < ARRAY_SIZE(products); i++) {

		/* Stand aside for hpsa driver on request */

		if (cciss_allow_hpsa && products[i].board_id == HPSA_BOUNDARY)

			return -ENODEV;

	for (i = 0; i < ARRAY_SIZE(products); i++)

		if (*board_id == products[i].board_id)

			return i;

	}

	dev_warn(&pdev->dev, "unrecognized board ID: 0x%08x, ignoring.\n",

		*board_id);

	return -ENODEV;