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

Commit aa471456 authored by Felipe Balbi's avatar Felipe Balbi Committed by Greg Kroah-Hartman
Browse files

usb: musb: core: declare mbase only where it's used 



... and avoid a compilation if we disable host side
of musb.

Signed-off-by: default avatarFelipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7f4bca40

drivers/usb/musb/musb_core.c

+7 −1
Original line number Diff line number Diff line
@@ -379,7 +379,6 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb, 
				u8 devctl, u8 power)

{

	irqreturn_t handled = IRQ_NONE;

	void __iomem *mbase = musb->mregs;



	DBG(3, "<== Power=%02x, DevCtl=%02x, int_usb=0x%x\n", power, devctl,

		int_usb);
@@ -394,6 +393,8 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb, 


		if (devctl & MUSB_DEVCTL_HM) {

#ifdef CONFIG_USB_MUSB_HDRC_HCD

			void __iomem *mbase = musb->mregs;



			switch (musb->xceiv->state) {

			case OTG_STATE_A_SUSPEND:

				/* remote wakeup?  later, GetPortStatus
@@ -471,6 +472,8 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb, 
#ifdef CONFIG_USB_MUSB_HDRC_HCD

	/* see manual for the order of the tests */

	if (int_usb & MUSB_INTR_SESSREQ) {

		void __iomem *mbase = musb->mregs;



		DBG(1, "SESSION_REQUEST (%s)\n", otg_state_string(musb));



		/* IRQ arrives from ID pin sense or (later, if VBUS power
@@ -519,6 +522,8 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb, 
		case OTG_STATE_A_WAIT_BCON:

		case OTG_STATE_A_WAIT_VRISE:

			if (musb->vbuserr_retry) {

				void __iomem *mbase = musb->mregs;



				musb->vbuserr_retry--;

				ignore = 1;

				devctl |= MUSB_DEVCTL_SESSION;
@@ -622,6 +627,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb, 


	if (int_usb & MUSB_INTR_CONNECT) {

		struct usb_hcd *hcd = musb_to_hcd(musb);

		void __iomem *mbase = musb->mregs;



		handled = IRQ_HANDLED;

		musb->is_active = 1;