summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrzej Pietrasiewicz <andrzej.p@samsung.com>2015-03-03 10:52:22 +0100
committerFelipe Balbi <balbi@ti.com>2015-03-10 15:33:38 -0500
commit143d53e10ecfeee7245341aa9c50515b5680ffd4 (patch)
tree9c63564a5b942dd002e4cdb8762aee275e4dc8b7
parent8fe20f661f3cfbb6778368eb3c73f8a6438ac640 (diff)
downloadlwn-143d53e10ecfeee7245341aa9c50515b5680ffd4.tar.gz
lwn-143d53e10ecfeee7245341aa9c50515b5680ffd4.zip
usb: gadget: printer: add container_of helper for printer_dev
5 uses of container_of() in the same context justify wrapping it in a static inline function. Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
-rw-r--r--drivers/usb/gadget/legacy/printer.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/usb/gadget/legacy/printer.c b/drivers/usb/gadget/legacy/printer.c
index 806475c19934..955847fe8092 100644
--- a/drivers/usb/gadget/legacy/printer.c
+++ b/drivers/usb/gadget/legacy/printer.c
@@ -89,6 +89,11 @@ struct printer_dev {
struct usb_function function;
};
+static inline struct printer_dev *func_to_printer(struct usb_function *f)
+{
+ return container_of(f, struct printer_dev, function);
+}
+
static struct printer_dev usb_printer_gadget;
/*-------------------------------------------------------------------------*/
@@ -973,7 +978,7 @@ static void printer_soft_reset(struct printer_dev *dev)
static int printer_func_setup(struct usb_function *f,
const struct usb_ctrlrequest *ctrl)
{
- struct printer_dev *dev = container_of(f, struct printer_dev, function);
+ struct printer_dev *dev = func_to_printer(f);
struct usb_composite_dev *cdev = f->config->cdev;
struct usb_request *req = cdev->req;
int value = -EOPNOTSUPP;
@@ -1047,7 +1052,7 @@ static int __init printer_func_bind(struct usb_configuration *c,
struct usb_function *f)
{
struct usb_gadget *gadget = c->cdev->gadget;
- struct printer_dev *dev = container_of(f, struct printer_dev, function);
+ struct printer_dev *dev = func_to_printer(f);
struct device *pdev;
struct usb_composite_dev *cdev = c->cdev;
struct usb_ep *in_ep;
@@ -1159,7 +1164,7 @@ static void printer_func_unbind(struct usb_configuration *c,
struct printer_dev *dev;
struct usb_request *req;
- dev = container_of(f, struct printer_dev, function);
+ dev = func_to_printer(f);
device_destroy(usb_gadget_class, g_printer_devno);
@@ -1200,7 +1205,7 @@ static void printer_func_unbind(struct usb_configuration *c,
static int printer_func_set_alt(struct usb_function *f,
unsigned intf, unsigned alt)
{
- struct printer_dev *dev = container_of(f, struct printer_dev, function);
+ struct printer_dev *dev = func_to_printer(f);
int ret = -ENOTSUPP;
if (!alt)
@@ -1211,7 +1216,7 @@ static int printer_func_set_alt(struct usb_function *f,
static void printer_func_disable(struct usb_function *f)
{
- struct printer_dev *dev = container_of(f, struct printer_dev, function);
+ struct printer_dev *dev = func_to_printer(f);
unsigned long flags;
DBG(dev, "%s\n", __func__);