usb: gadget: uac1: struct gaudio is useless for struct f_uac1_opts

Since we call gaudio_cleanup at f_audio_free, the f_uac1_opts
doesn't need to use gaudio any more.

Signed-off-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
index d8b4af6b52733432e027855b803740e3b066b7a9..9cf225243f9f41bc847224e6a515b66cd4d8941d 100644 (file)
--- a/drivers/usb/gadget/function/f_uac1.c
+++ b/drivers/usb/gadget/function/f_uac1.c
@@ -674,7 +674,6 @@ f_audio_bind(struct usb_configuration *c, struct usb_function *f)
 
        audio_opts = container_of(f->fi, struct f_uac1_opts, func_inst);
        audio->card.gadget = c->cdev->gadget;
-       audio_opts->card = &audio->card;
        /* set up ASLA audio devices */
        if (!audio_opts->bound) {
                status = gaudio_setup(&audio->card);

diff --git a/drivers/usb/gadget/function/u_uac1.h b/drivers/usb/gadget/function/u_uac1.h
index f8b17fe82efedf054e92e5351bbc92d542e939ac..fe386df6dd3e67843c597ee0301298a01c490ee7 100644 (file)
--- a/drivers/usb/gadget/function/u_uac1.h
+++ b/drivers/usb/gadget/function/u_uac1.h
@@ -70,7 +70,6 @@ struct f_uac1_opts {
        unsigned                        fn_play_alloc:1;
        unsigned                        fn_cap_alloc:1;
        unsigned                        fn_cntl_alloc:1;
-       struct gaudio                   *card;
        struct mutex                    lock;
        int                             refcnt;
 };