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

Commit 84859c92 authored by Mahesh Rajashekhara's avatar Mahesh Rajashekhara Committed by James Bottomley
Browse files

aacraid: Use pci_enable_msix_range() 



As pci_enable_msix() deprecated, replaced with pci_enable_msix_range()

Reviewed-by: default avatarTomas Henzl <thenzl@redhat.com>
Reviewed-by: default avatarMurthy Bhat <Murthy.Bhat@pmcs.com>
Reviewed-by: default avatarKarthikeya Sunkesula <Karthikeya.Sunkesula@pmcs.com>
Signed-off-by: default avatarMahesh Rajashekhara <Mahesh.Rajashekhara@pmcs.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Odin.com>
parent e728f8e3

drivers/scsi/aacraid/aacraid.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
 *              D E F I N E S

 *----------------------------------------------------------------------------*/



#define AAC_MAX_MSIX		8	/* vectors */

#define AAC_MAX_MSIX		32	/* vectors */

#define AAC_PCI_MSI_ENABLE	0x8000



enum {

drivers/scsi/aacraid/comminit.c

+6 −14
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ static int aac_comm_init(struct aac_dev * dev) 


void aac_define_int_mode(struct aac_dev *dev)

{

	int i, msi_count;

	int i, msi_count, min_msix;



	msi_count = i = 0;

	/* max. vectors from GET_COMM_PREFERRED_SETTINGS */
@@ -366,22 +366,14 @@ void aac_define_int_mode(struct aac_dev *dev) 


	if (msi_count > 1 &&

	    pci_find_capability(dev->pdev, PCI_CAP_ID_MSIX)) {

		i = pci_enable_msix(dev->pdev,

		min_msix = 2;

		i = pci_enable_msix_range(dev->pdev,

				    dev->msixentry,

				    min_msix,

				    msi_count);

		 /* Check how many MSIX vectors are allocated */

		if (i >= 0) {

		if (i > 0) {

			dev->msi_enabled = 1;

			if (i) {

			msi_count = i;

				if (pci_enable_msix(dev->pdev,

				    dev->msixentry,

				    msi_count)) {

					dev->msi_enabled = 0;

					printk(KERN_ERR "%s%d: MSIX not supported!! Will try MSI 0x%x.\n",

							dev->name, dev->id, i);

				}

			}

		} else {

			dev->msi_enabled = 0;

			printk(KERN_ERR "%s%d: MSIX not supported!! Will try MSI 0x%x.\n",