Re: [PATCH 01/26] usb/gadget/pxa25x: is_vbus_present is gone

From: Eric Miao
Date: Thu Oct 06 2011 - 22:28:08 EST


On Sun, Oct 2, 2011 at 4:03 AM, Arnd Bergmann <arnd@xxxxxxxx> wrote:
> A recent commit obsoleted the is_vbus_present function, so
> we must not use it any more.
>
> Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
> Cc: Felipe Balbi <balbi@xxxxxx>

Acked-by: Eric Miao <eric.y.miao@xxxxxxxxx>

> ---
> Âdrivers/usb/gadget/pxa25x_udc.h | Â Â8 +-------
> Â1 files changed, 1 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/usb/gadget/pxa25x_udc.h b/drivers/usb/gadget/pxa25x_udc.h
> index f572c56..6119900 100644
> --- a/drivers/usb/gadget/pxa25x_udc.h
> +++ b/drivers/usb/gadget/pxa25x_udc.h
> @@ -161,8 +161,6 @@ static struct pxa25x_udc *the_controller;
>
> Â#ifdef DEBUG
>
> -static int is_vbus_present(void);
> -
> Âstatic const char *state_name[] = {
> Â Â Â Â"EP0_IDLE",
> Â Â Â Â"EP0_IN_DATA_PHASE", "EP0_OUT_DATA_PHASE",
> @@ -214,8 +212,7 @@ dump_state(struct pxa25x_udc *dev)
> Â Â Â Âu32 Â Â Â Â Â Â tmp;
>    Âunsigned    Âi;
>
> - Â Â Â DMSG("%s %s, uicr %02X.%02X, usir %02X.%02x, ufnr %02X.%02X\n",
> - Â Â Â Â Â Â Â is_vbus_present() ? "host " : "disconnected",
> + Â Â Â DMSG("%s, uicr %02X.%02X, usir %02X.%02x, ufnr %02X.%02X\n",
> Â Â Â Â Â Â Â Âstate_name[dev->ep0state],
> Â Â Â Â Â Â Â ÂUICR1, UICR0, USIR1, USIR0, UFNRH, UFNRL);
> Â Â Â Âdump_udccr("udccr");
> @@ -232,9 +229,6 @@ dump_state(struct pxa25x_udc *dev)
> Â Â Â Â} else
> Â Â Â Â Â Â Â ÂDMSG("ep0 driver '%s'\n", dev->driver->driver.name);
>
> - Â Â Â if (!is_vbus_present())
> - Â Â Â Â Â Â Â return;
> -
> Â Â Â Âdump_udccs0 ("udccs0");
> Â Â Â ÂDMSG("ep0 IN %lu/%lu, OUT %lu/%lu\n",
> Â Â Â Â Â Â Â Âdev->stats.write.bytes, dev->stats.write.ops,
> --
> 1.7.5.4
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/