aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/s3c-hsotg.c
diff options
context:
space:
mode:
authorLukasz Majewski <l.majewski@samsung.com>2012-05-04 08:17:12 -0400
committerFelipe Balbi <balbi@ti.com>2012-05-04 08:53:16 -0400
commitf99b2bfebe8984db2b6e4c07e2bedc91977d27d8 (patch)
tree35e7b3a220d014b2fba41c3191405dec44e8fc9a /drivers/usb/gadget/s3c-hsotg.c
parent8b9bc4608eefebd9958911017caac8d87e2e8b3c (diff)
usb:hsotg:samsung: Remove our_hsotg global pointer
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>
Diffstat (limited to 'drivers/usb/gadget/s3c-hsotg.c')
-rw-r--r--drivers/usb/gadget/s3c-hsotg.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c
index 710823b49dd4..cd7ae3aef0c0 100644
--- a/drivers/usb/gadget/s3c-hsotg.c
+++ b/drivers/usb/gadget/s3c-hsotg.c
@@ -2194,8 +2194,6 @@ static void s3c_hsotg_irq_fifoempty(struct s3c_hsotg *hsotg, bool periodic)
2194 } 2194 }
2195} 2195}
2196 2196
2197static struct s3c_hsotg *our_hsotg;
2198
2199/* IRQ flags which will trigger a retry around the IRQ loop */ 2197/* IRQ flags which will trigger a retry around the IRQ loop */
2200#define IRQ_RETRY_MASK (S3C_GINTSTS_NPTxFEmp | \ 2198#define IRQ_RETRY_MASK (S3C_GINTSTS_NPTxFEmp | \
2201 S3C_GINTSTS_PTxFEmp | \ 2199 S3C_GINTSTS_PTxFEmp | \
@@ -2930,7 +2928,7 @@ static void s3c_hsotg_init(struct s3c_hsotg *hsotg)
2930static int s3c_hsotg_udc_start(struct usb_gadget *gadget, 2928static int s3c_hsotg_udc_start(struct usb_gadget *gadget,
2931 struct usb_gadget_driver *driver) 2929 struct usb_gadget_driver *driver)
2932{ 2930{
2933 struct s3c_hsotg *hsotg = our_hsotg; 2931 struct s3c_hsotg *hsotg = to_hsotg(gadget);
2934 int ret; 2932 int ret;
2935 2933
2936 if (!hsotg) { 2934 if (!hsotg) {
@@ -2989,7 +2987,7 @@ err:
2989static int s3c_hsotg_udc_stop(struct usb_gadget *gadget, 2987static int s3c_hsotg_udc_stop(struct usb_gadget *gadget,
2990 struct usb_gadget_driver *driver) 2988 struct usb_gadget_driver *driver)
2991{ 2989{
2992 struct s3c_hsotg *hsotg = our_hsotg; 2990 struct s3c_hsotg *hsotg = to_hsotg(gadget);
2993 int ep; 2991 int ep;
2994 2992
2995 if (!hsotg) 2993 if (!hsotg)
@@ -3624,7 +3622,6 @@ static int __devinit s3c_hsotg_probe(struct platform_device *pdev)
3624 3622
3625 s3c_hsotg_dump(hsotg); 3623 s3c_hsotg_dump(hsotg);
3626 3624
3627 our_hsotg = hsotg;
3628 return 0; 3625 return 0;
3629 3626
3630 err_ep_mem: 3627 err_ep_mem: