forked from luck/tmp_suning_uos_patched
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: Arjan van de Ven <arjan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
e64a521929
commit
8e8ce4b642
@ -172,9 +172,9 @@ static void __devinit quirk_usb_handoff_ohci(struct pci_dev *pdev)
|
|||||||
if (!mmio_resource_enabled(pdev, 0))
|
if (!mmio_resource_enabled(pdev, 0))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
base = ioremap_nocache(pci_resource_start(pdev, 0),
|
base = pci_ioremap_bar(pdev, 0);
|
||||||
pci_resource_len(pdev, 0));
|
if (base == NULL)
|
||||||
if (base == NULL) return;
|
return;
|
||||||
|
|
||||||
/* On PA-RISC, PDC can leave IR set incorrectly; ignore it there. */
|
/* On PA-RISC, PDC can leave IR set incorrectly; ignore it there. */
|
||||||
#ifndef __hppa__
|
#ifndef __hppa__
|
||||||
@ -221,9 +221,9 @@ static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev)
|
|||||||
if (!mmio_resource_enabled(pdev, 0))
|
if (!mmio_resource_enabled(pdev, 0))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
base = ioremap_nocache(pci_resource_start(pdev, 0),
|
base = pci_ioremap_bar(pdev, 0);
|
||||||
pci_resource_len(pdev, 0));
|
if (base == NULL)
|
||||||
if (base == NULL) return;
|
return;
|
||||||
|
|
||||||
cap_length = readb(base);
|
cap_length = readb(base);
|
||||||
op_reg_base = base + cap_length;
|
op_reg_base = base + cap_length;
|
||||||
|
Loading…
Reference in New Issue
Block a user