From: heiko@sntech•de (Heiko Stübner)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 8/8] s3c-hsudc: remove the_controller global
Date: Mon, 19 Dec 2011 19:43:35 +0100 [thread overview]
Message-ID: <201112191943.35591.heiko@sntech.de> (raw)
In-Reply-To: <201112191938.22254.heiko@sntech.de>
Instead use container_of to retrieve the s3c_hsudc from the
struct usb_gadget pointer.
Signed-off-by: Heiko Stuebner <heiko@sntech•de>
---
drivers/usb/gadget/s3c-hsudc.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/usb/gadget/s3c-hsudc.c b/drivers/usb/gadget/s3c-hsudc.c
index 8e69758..23cac9d 100644
--- a/drivers/usb/gadget/s3c-hsudc.c
+++ b/drivers/usb/gadget/s3c-hsudc.c
@@ -161,7 +161,6 @@ struct s3c_hsudc {
#define ep_index(_ep) ((_ep)->bEndpointAddress & \
USB_ENDPOINT_NUMBER_MASK)
-static struct s3c_hsudc *the_controller;
static const char driver_name[] = "s3c-udc";
static const char ep0name[] = "ep0-control";
@@ -1141,7 +1140,8 @@ static irqreturn_t s3c_hsudc_irq(int irq, void *_dev)
static int s3c_hsudc_start(struct usb_gadget *gadget,
struct usb_gadget_driver *driver)
{
- struct s3c_hsudc *hsudc = the_controller;
+ struct s3c_hsudc *hsudc =
+ container_of(gadget, struct s3c_hsudc, gadget);
int ret;
if (!driver
@@ -1195,7 +1195,8 @@ err_supplies:
static int s3c_hsudc_stop(struct usb_gadget *gadget,
struct usb_gadget_driver *driver)
{
- struct s3c_hsudc *hsudc = the_controller;
+ struct s3c_hsudc *hsudc =
+ container_of(gadget, struct s3c_hsudc, gadget);
unsigned long flags;
if (!hsudc)
@@ -1238,7 +1239,8 @@ static int s3c_hsudc_gadget_getframe(struct usb_gadget *gadget)
static int s3c_hsudc_vbus_draw(struct usb_gadget *gadget, unsigned mA)
{
- struct s3c_hsudc *hsudc = the_controller;
+ struct s3c_hsudc *hsudc =
+ container_of(gadget, struct s3c_hsudc, gadget);
if (!hsudc)
return -ENODEV;
@@ -1272,7 +1274,6 @@ static int __devinit s3c_hsudc_probe(struct platform_device *pdev)
return -ENOMEM;
}
- the_controller = hsudc;
platform_set_drvdata(pdev, dev);
hsudc->dev = dev;
hsudc->pd = pdev->dev.platform_data;
--
1.7.2.3
next prev parent reply other threads:[~2011-12-19 18:43 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-19 18:38 [PATCH v4 0/8] s3c-hsudc: regulator handling and a lot of fixes Heiko Stübner
2011-12-19 18:39 ` [PATCH 1/8] s3c-hsudc: move platform_data struct to global header Heiko Stübner
2011-12-20 11:25 ` Felipe Balbi
2011-12-20 11:36 ` Heiko Stübner
2011-12-21 4:06 ` Kukjin Kim
2011-12-21 11:25 ` Felipe Balbi
2011-12-19 18:39 ` [PATCH 2/8] s3c-hsudc: add __devinit to probe function Heiko Stübner
2011-12-19 18:40 ` [PATCH 3/8] s3c-hsudc: add missing otg_put_transceiver in probe Heiko Stübner
2011-12-19 18:41 ` [PATCH 4/8] s3c-hsudc: move device registration to probe Heiko Stübner
2011-12-19 18:41 ` [PATCH 5/8] s3c-hsudc: use udc_start and udc_stop functions Heiko Stübner
2011-12-20 11:23 ` Felipe Balbi
2011-12-19 18:42 ` [PATCH 6/8] s3c-hsudc: Add regulator handling Heiko Stübner
2011-12-19 18:42 ` [PATCH 7/8] s3c-hsudc: use release_mem_region instead of release_resource Heiko Stübner
2011-12-20 20:10 ` Russell King - ARM Linux
2011-12-20 21:09 ` Felipe Balbi
2011-12-20 21:19 ` Russell King - ARM Linux
2011-12-19 18:43 ` Heiko Stübner [this message]
2011-12-20 11:27 ` [PATCH 8/8] s3c-hsudc: remove the_controller global Felipe Balbi
2011-12-20 11:29 ` Felipe Balbi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201112191943.35591.heiko@sntech.de \
--to=heiko@sntech$(echo .)de \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox