usb: gadget: remove build warnings

[profile/mobile/platform/kernel/u-boot-tm1.git] / drivers / usb / gadget / f_acm.c

diff --git a/drivers/usb/gadget/f_acm.c b/drivers/usb/gadget/f_acm.c
index 92c5f66..0dc0499 100644 (file)
--- a/drivers/usb/gadget/f_acm.c
+++ b/drivers/usb/gadget/f_acm.c
@@ -267,17 +267,18 @@ static void acm_complete_set_line_coding(struct usb_ep *ep,
                struct usb_request *req)
 {
        struct f_acm    *acm = ep->driver_data;
-       struct usb_composite_dev *cdev = acm->port.func.config->cdev;
 
        if (req->status != 0) {
-               DBG(cdev, "acm ttyGS%d completion, err %d\n",
+               DBG(acm->port.func.config->cdev,
+                               "acm ttyGS%d completion, err %d\n",
                                acm->port_num, req->status);
                return;
        }
 
        /* normal completion */
        if (req->actual != sizeof(acm->port_line_coding)) {
-               DBG(cdev, "acm ttyGS%d short resp, len %d\n",
+               DBG(acm->port.func.config->cdev,
+                               "acm ttyGS%d short resp, len %d\n",
                                acm->port_num, req->actual);
                usb_ep_set_halt(ep);
        } else {
@@ -418,9 +419,8 @@ static int acm_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
 static void acm_disable(struct usb_function *f)
 {
        struct f_acm    *acm = func_to_acm(f);
-       struct usb_composite_dev *cdev = f->config->cdev;
 
-       DBG(cdev, "acm ttyGS%d deactivated\n", acm->port_num);
+       DBG(f->config->cdev, "acm ttyGS%d deactivated\n", acm->port_num);
        gserial_disconnect(&acm->port);
        usb_ep_disable(acm->notify);
        acm->notify->driver_data = NULL;
@@ -485,12 +485,12 @@ static int acm_cdc_notify(struct f_acm *acm, u8 type, u16 value,
 
 static int acm_notify_serial_state(struct f_acm *acm)
 {
-       struct usb_composite_dev *cdev = acm->port.func.config->cdev;
        int                     status;
 
        spin_lock(&acm->lock);
        if (acm->notify_req) {
-               DBG(cdev, "acm ttyGS%d serial state %04x\n",
+               DBG(acm->port.func.config->cdev,
+                               "acm ttyGS%d serial state %04x\n",
                                acm->port_num, acm->serial_state);
                status = acm_cdc_notify(acm, USB_CDC_NOTIFY_SERIAL_STATE,
                                0, &acm->serial_state, sizeof(acm->serial_state));