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

Commit 8e8ce4b6 authored by Arjan van de Ven's avatar Arjan van de Ven Committed by Greg Kroah-Hartman
Browse files

USB: use pci_ioremap_bar() in drivers/usb 



Use the newly introduced pci_ioremap_bar() function in drivers/usb.
pci_ioremap_bar() just takes a pci device and a bar number, with the goal
of making it really hard to get wrong, while also having a central place
to stick sanity checks.

Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e64a5219

drivers/usb/host/pci-quirks.c

+6 −6
Original line number Diff line number Diff line
@@ -172,9 +172,9 @@ static void __devinit quirk_usb_handoff_ohci(struct pci_dev *pdev) 
	if (!mmio_resource_enabled(pdev, 0))

		return;



	base = ioremap_nocache(pci_resource_start(pdev, 0),

				     pci_resource_len(pdev, 0));

	if (base == NULL) return;

	base = pci_ioremap_bar(pdev, 0);

	if (base == NULL)

		return;



/* On PA-RISC, PDC can leave IR set incorrectly; ignore it there. */

#ifndef __hppa__
@@ -221,9 +221,9 @@ static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev) 
	if (!mmio_resource_enabled(pdev, 0))

		return;



	base = ioremap_nocache(pci_resource_start(pdev, 0),

				pci_resource_len(pdev, 0));

	if (base == NULL) return;

	base = pci_ioremap_bar(pdev, 0);

	if (base == NULL)

		return;



	cap_length = readb(base);

	op_reg_base = base + cap_length;