On 22.7.2015 18:49, [email protected] wrote: > From: Rajinikanth Pandurangan <[email protected]> > > Description: > As pci_enable_msix() deprecated, replaced with pci_enable_msix_range() > > V4 Reviewed/commented by: > Tomas Henzl <[email protected]> > > Changes from V4: > Changed to 1 as minimum msix range in pci_enable_msix_range() > to match with original code. I don't this is correct, your original code hasn't allowed a single msi-x line too, it allowed it in an exact same range <2,8> like it is now with 10+11/11 patch applied. It looks like you have decided to not change the minimal supported value in the end, that means that not two but a single patch is preferred. If you for any reason repost your series, please merge 10+11 into a single patch. I can accept it in the current form too so -
Reviewed-by: Tomas Henzl <[email protected]> Tomas > > Signed-off-by: Rajinikanth Pandurangan <[email protected]> > --- > drivers/scsi/aacraid/comminit.c | 20 ++++++-------------- > 1 file changed, 6 insertions(+), 14 deletions(-) > > diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c > index b4b6088..a02cfb3 100644 > --- a/drivers/scsi/aacraid/comminit.c > +++ b/drivers/scsi/aacraid/comminit.c > @@ -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 = 1; > + 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); > - } > - } > + msi_count = i; > } else { > dev->msi_enabled = 0; > printk(KERN_ERR "%s%d: MSIX not supported!! Will try > MSI 0x%x.\n", > -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
