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

Commit 263bf612 authored by Russell King's avatar Russell King Committed by Greg Kroah-Hartman
Browse files

usb: ohci-sa1111: remove special sa1111 mmio accessors 



Remove the special SA1111 MMIO accessors from the ohci-sa1111 driver
as their definition will be removed shortly.  The SA1111 accessors are
barrierless, so use the _relaxed variants.

Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6c771d30

drivers/usb/host/ohci-sa1111.c

+5 −5
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
#if 0

static void dump_hci_status(struct usb_hcd *hcd, const char *label)

{

	unsigned long status = sa1111_readl(hcd->regs + USB_STATUS);

	unsigned long status = readl_relaxed(hcd->regs + USB_STATUS);



	printk(KERN_DEBUG "%s USB_STATUS = { %s%s%s%s%s}\n", label,

	     ((status & USB_STATUS_IRQHCIRMTWKUP) ? "IRQHCIRMTWKUP " : ""),
@@ -134,7 +134,7 @@ static int sa1111_start_hc(struct sa1111_dev *dev) 
	 * Configure the power sense and control lines.  Place the USB

	 * host controller in reset.

	 */

	sa1111_writel(usb_rst | USB_RESET_FORCEIFRESET | USB_RESET_FORCEHCRESET,

	writel_relaxed(usb_rst | USB_RESET_FORCEIFRESET | USB_RESET_FORCEHCRESET,

		      dev->mapbase + USB_RESET);



	/*
@@ -144,7 +144,7 @@ static int sa1111_start_hc(struct sa1111_dev *dev) 
	ret = sa1111_enable_device(dev);

	if (ret == 0) {

		udelay(11);

		sa1111_writel(usb_rst, dev->mapbase + USB_RESET);

		writel_relaxed(usb_rst, dev->mapbase + USB_RESET);

	}



	return ret;
@@ -159,8 +159,8 @@ static void sa1111_stop_hc(struct sa1111_dev *dev) 
	/*

	 * Put the USB host controller into reset.

	 */

	usb_rst = sa1111_readl(dev->mapbase + USB_RESET);

	sa1111_writel(usb_rst | USB_RESET_FORCEIFRESET | USB_RESET_FORCEHCRESET,

	usb_rst = readl_relaxed(dev->mapbase + USB_RESET);

	writel_relaxed(usb_rst | USB_RESET_FORCEIFRESET | USB_RESET_FORCEHCRESET,

		      dev->mapbase + USB_RESET);



	/*