Skip to content

Commit

Permalink
usb:hsotg:samsung: Remove our_hsotg global pointer
Browse files Browse the repository at this point in the history
The our_hsotg global pointer to hsotg USB device state is removed.
It has been replaced with to_hsotg(gadget) function.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
  • Loading branch information
Lukasz Majewski authored and Felipe Balbi committed May 4, 2012
1 parent 8b9bc46 commit f99b2bf
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions drivers/usb/gadget/s3c-hsotg.c
Original file line number Diff line number Diff line change
Expand Up @@ -2194,8 +2194,6 @@ static void s3c_hsotg_irq_fifoempty(struct s3c_hsotg *hsotg, bool periodic)
}
}

static struct s3c_hsotg *our_hsotg;

/* IRQ flags which will trigger a retry around the IRQ loop */
#define IRQ_RETRY_MASK (S3C_GINTSTS_NPTxFEmp | \
S3C_GINTSTS_PTxFEmp | \
Expand Down Expand Up @@ -2930,7 +2928,7 @@ static void s3c_hsotg_init(struct s3c_hsotg *hsotg)
static int s3c_hsotg_udc_start(struct usb_gadget *gadget,
struct usb_gadget_driver *driver)
{
struct s3c_hsotg *hsotg = our_hsotg;
struct s3c_hsotg *hsotg = to_hsotg(gadget);
int ret;

if (!hsotg) {
Expand Down Expand Up @@ -2989,7 +2987,7 @@ static int s3c_hsotg_udc_start(struct usb_gadget *gadget,
static int s3c_hsotg_udc_stop(struct usb_gadget *gadget,
struct usb_gadget_driver *driver)
{
struct s3c_hsotg *hsotg = our_hsotg;
struct s3c_hsotg *hsotg = to_hsotg(gadget);
int ep;

if (!hsotg)
Expand Down Expand Up @@ -3624,7 +3622,6 @@ static int __devinit s3c_hsotg_probe(struct platform_device *pdev)

s3c_hsotg_dump(hsotg);

our_hsotg = hsotg;
return 0;

err_ep_mem:
Expand Down

0 comments on commit f99b2bf

Please sign in to comment.