On Thu, Mar 06, 2014 at 09:11:24PM +0100, Alexander Gordeev wrote:
> As result of deprecation of MSI-X/MSI enablement functions
> pci_enable_msix() and pci_enable_msi_block() all drivers
> using these two interfaces need to be updated to use the
> new pci_enable_msi_range() or pci_enable_msi_exact()
> and pci_enable_msix_range() or pci_enable_msix_exact()
> interfaces.
>
> This update also cleans up a bit xhci_setup_msi() and
> xhci_setup_msix() returning of success.
What do you mean by this sentence? Are you fixing some bug in those two
functions, or just cleaning up how they look? Either way, this should
really be two patches.
Sarah Sharp
> Signed-off-by: Alexander Gordeev <agordeev@xxxxxxxxxx>
> Cc: Sarah Sharp <sarah.a.sharp@xxxxxxxxxxxxxxx>
> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> Cc: linux-usb@xxxxxxxxxxxxxxx
> Cc: linux-pci@xxxxxxxxxxxxxxx
> ---
> drivers/usb/host/xhci.c | 7 ++++---
> 1 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
> index 6fe577d..dc7cfb5 100644
> --- a/drivers/usb/host/xhci.c
> +++ b/drivers/usb/host/xhci.c
> @@ -232,9 +232,10 @@ static int xhci_setup_msi(struct xhci_hcd *xhci)
> xhci_dbg_trace(xhci, trace_xhci_dbg_init,
> "disable MSI interrupt");
> pci_disable_msi(pdev);
> + return ret;
> }
>
> - return ret;
> + return 0;
> }
>
> /*
> @@ -291,7 +292,7 @@ static int xhci_setup_msix(struct xhci_hcd *xhci)
> xhci->msix_entries[i].vector = 0;
> }
>
> - ret = pci_enable_msix(pdev, xhci->msix_entries, xhci->msix_count);
> + ret = pci_enable_msix_exact(pdev, xhci->msix_entries, xhci->msix_count);
> if (ret) {
> xhci_dbg_trace(xhci, trace_xhci_dbg_init,
> "Failed to enable MSI-X");
> @@ -307,7 +308,7 @@ static int xhci_setup_msix(struct xhci_hcd *xhci)
> }
>
> hcd->msix_enabled = 1;
> - return ret;
> + return 0;
>
> disable_msix:
> xhci_dbg_trace(xhci, trace_xhci_dbg_init, "disable MSI-X interrupt");
> --
> 1.7.7.6
>
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
