On Fri, Feb 21, 2014 at 04:49:30PM +0100, Alexander Gordeev wrote:
> Signed-off-by: Alexander Gordeev <agordeev@xxxxxxxxxx>
> Cc: Jon Mason <jon.mason@xxxxxxxxx>
Looks good. Pulling into my tree.
Thanks,
Jon
> Cc: linux-pci@xxxxxxxxxxxxxxx
> ---
> drivers/ntb/ntb_hw.c | 15 ++++-----------
> drivers/ntb/ntb_hw.h | 2 --
> 2 files changed, 4 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/ntb/ntb_hw.c b/drivers/ntb/ntb_hw.c
> index 487169dd..53468f4 100644
> --- a/drivers/ntb/ntb_hw.c
> +++ b/drivers/ntb/ntb_hw.c
> @@ -1085,19 +1085,12 @@ static int ntb_setup_msix(struct ntb_device *ndev)
> struct msix_entry *msix;
> int msix_entries;
> int rc, i;
> - u16 val;
>
> - if (!pdev->msix_cap) {
> - rc = -EIO;
> - goto err;
> - }
> -
> - rc = pci_read_config_word(pdev, pdev->msix_cap + PCI_MSIX_FLAGS, &val);
> - if (rc)
> + msix_entries = pci_msix_vec_count(pdev);
> + if (msix_entries < 0) {
> + rc = msix_entries;
> goto err;
> -
> - msix_entries = msix_table_size(val);
> - if (msix_entries > ndev->limits.msix_cnt) {
> + } else if (msix_entries > ndev->limits.msix_cnt) {
> rc = -EINVAL;
> goto err;
> }
> diff --git a/drivers/ntb/ntb_hw.h b/drivers/ntb/ntb_hw.h
> index bbdb7ed..d307107 100644
> --- a/drivers/ntb/ntb_hw.h
> +++ b/drivers/ntb/ntb_hw.h
> @@ -60,8 +60,6 @@
> #define PCI_DEVICE_ID_INTEL_NTB_SS_HSX 0x2F0F
> #define PCI_DEVICE_ID_INTEL_NTB_B2B_BWD 0x0C4E
>
> -#define msix_table_size(control) ((control & PCI_MSIX_FLAGS_QSIZE)+1)
> -
> #ifndef readq
> static inline u64 readq(void __iomem *addr)
> {
> --
> 1.7.7.6
>
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
