Commit c43cc5a7 authored by Felipe Balbi's avatar Felipe Balbi Committed by Tony Lindgren

I2C: TWL4030: Cleanup twl4030-usb.c

General cleanup on twl4030-usb.c
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent bb630fee
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include <linux/time.h> #include <linux/time.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/i2c/twl4030.h> #include <linux/i2c/twl4030.h>
/* Register defines */ /* Register defines */
...@@ -248,6 +247,18 @@ ...@@ -248,6 +247,18 @@
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
struct twl4030_usb {
int irq;
u8 usb_mode; /* pin configuration */
#define T2_USB_MODE_ULPI 1
/* #define T2_USB_MODE_CEA2011_3PIN 2 */
u8 asleep;
};
static struct twl4030_usb *the_transceiver;
/*-------------------------------------------------------------------------*/
static int twl4030_i2c_write_u8_verify(u8 module, u8 data, u8 address) static int twl4030_i2c_write_u8_verify(u8 module, u8 data, u8 address)
{ {
u8 check; u8 check;
...@@ -307,18 +318,6 @@ static inline int twl4030_usb_read(u8 address) ...@@ -307,18 +318,6 @@ static inline int twl4030_usb_read(u8 address)
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
struct twl4030_usb {
int irq;
u8 usb_mode; /* pin configuration */
#define T2_USB_MODE_ULPI 1
/* #define T2_USB_MODE_CEA2011_3PIN 2 */
u8 asleep;
};
static struct twl4030_usb *the_transceiver;
/*-------------------------------------------------------------------------*/
static inline int static inline int
twl4030_usb_set_bits(struct twl4030_usb *twl, u8 reg, u8 bits) twl4030_usb_set_bits(struct twl4030_usb *twl, u8 reg, u8 bits)
{ {
...@@ -616,7 +615,7 @@ static int __init twl4030_usb_init(void) ...@@ -616,7 +615,7 @@ static int __init twl4030_usb_init(void)
if (the_transceiver) if (the_transceiver)
return 0; return 0;
twl = kcalloc(1, sizeof *twl, GFP_KERNEL); twl = kzalloc(sizeof *twl, GFP_KERNEL);
if (!twl) if (!twl)
return 0; return 0;
......
...@@ -227,7 +227,6 @@ int __init musb_platform_init(struct musb *musb) ...@@ -227,7 +227,6 @@ int __init musb_platform_init(struct musb *musb)
omap_vbus_power(musb, musb->board_mode == MUSB_HOST, 1); omap_vbus_power(musb, musb->board_mode == MUSB_HOST, 1);
if (is_host_enabled(musb)) if (is_host_enabled(musb))
musb->board_set_vbus = omap_set_vbus; musb->board_set_vbus = omap_set_vbus;
if (is_peripheral_enabled(musb)) if (is_peripheral_enabled(musb))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment