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

Commit 7009bdd7 authored by Felipe Balbi's avatar Felipe Balbi
Browse files

usb: otg: move usb_otg_state_string to usb-common.c 



otg.c only had a single function definition
which might make more sense to be placed in
usb-common.c. While doing that, we also delete
otg.c since it's now empty.

Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 42c0bf1c

drivers/usb/otg/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -5,9 +5,6 @@ 
ccflags-$(CONFIG_USB_DEBUG)		:= -DDEBUG

ccflags-$(CONFIG_USB_GADGET_DEBUG)	+= -DDEBUG



# infrastructure

obj-$(CONFIG_USB_OTG_UTILS)	+= otg.o



# transceiver drivers

obj-$(CONFIG_USB_GPIO_VBUS)	+= gpio_vbus.o

obj-$(CONFIG_ISP1301_OMAP)	+= isp1301_omap.o

drivers/usb/otg/otg.c

deleted100644 → 0
+0 −47
Original line number Diff line number Diff line 
/*

 * otg.c -- USB OTG utility code

 *

 * Copyright (C) 2004 Texas Instruments

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 */

#include <linux/export.h>

#include <linux/usb/otg.h>



const char *usb_otg_state_string(enum usb_otg_state state)

{

	switch (state) {

	case OTG_STATE_A_IDLE:

		return "a_idle";

	case OTG_STATE_A_WAIT_VRISE:

		return "a_wait_vrise";

	case OTG_STATE_A_WAIT_BCON:

		return "a_wait_bcon";

	case OTG_STATE_A_HOST:

		return "a_host";

	case OTG_STATE_A_SUSPEND:

		return "a_suspend";

	case OTG_STATE_A_PERIPHERAL:

		return "a_peripheral";

	case OTG_STATE_A_WAIT_VFALL:

		return "a_wait_vfall";

	case OTG_STATE_A_VBUS_ERR:

		return "a_vbus_err";

	case OTG_STATE_B_IDLE:

		return "b_idle";

	case OTG_STATE_B_SRP_INIT:

		return "b_srp_init";

	case OTG_STATE_B_PERIPHERAL:

		return "b_peripheral";

	case OTG_STATE_B_WAIT_ACON:

		return "b_wait_acon";

	case OTG_STATE_B_HOST:

		return "b_host";

	default:

		return "UNDEFINED";

	}

}

EXPORT_SYMBOL(usb_otg_state_string);

drivers/usb/usb-common.c

+26 −0
Original line number Diff line number Diff line
@@ -14,6 +14,32 @@ 
#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/usb/ch9.h>

#include <linux/usb/otg.h>



const char *usb_otg_state_string(enum usb_otg_state state)

{

	static const char *const names[] = {

		[OTG_STATE_A_IDLE] = "a_idle",

		[OTG_STATE_A_WAIT_VRISE] = "a_wait_vrise",

		[OTG_STATE_A_WAIT_BCON] = "a_wait_bcon",

		[OTG_STATE_A_HOST] = "a_host",

		[OTG_STATE_A_SUSPEND] = "a_suspend",

		[OTG_STATE_A_PERIPHERAL] = "a_peripheral",

		[OTG_STATE_A_WAIT_VFALL] = "a_wait_vfall",

		[OTG_STATE_A_VBUS_ERR] = "a_vbus_err",

		[OTG_STATE_B_IDLE] = "b_idle",

		[OTG_STATE_B_SRP_INIT] = "b_srp_init",

		[OTG_STATE_B_PERIPHERAL] = "b_peripheral",

		[OTG_STATE_B_WAIT_ACON] = "b_wait_acon",

		[OTG_STATE_B_HOST] = "b_host",

	};



	if (state < 0 || state >= ARRAY_SIZE(names))

		return "UNDEFINED";



	return names[state];

}

EXPORT_SYMBOL_GPL(usb_otg_state_string);



const char *usb_speed_string(enum usb_device_speed speed)

{

include/linux/usb/otg.h

+0 −7
Original line number Diff line number Diff line
@@ -36,14 +36,7 @@ struct usb_otg { 


};



#ifdef CONFIG_USB_OTG_UTILS

extern const char *usb_otg_state_string(enum usb_otg_state state);

#else

static inline const char *usb_otg_state_string(enum usb_otg_state state)

{

	return NULL;

}

#endif



/* Context: can sleep */

static inline int