media: dvbsky: use just one mutex for serializing device R/W ops

Right now, there are two mutexes serializing r/w ops: one "generic"
and another one specifically for stream on/off.

Clean it a little bit, getting rid of one of the mutexes.

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/usb/dvb-usb-v2/dvbsky.c b/drivers/media/usb/dvb-usb-v2/dvbsky.c
index e28bd8836751e46e9ee4a1209d953b374dc2bde2..1aa88d94e57f5e54c96c097c86d1f9c91e82608b 100644 (file)
--- a/drivers/media/usb/dvb-usb-v2/dvbsky.c
+++ b/drivers/media/usb/dvb-usb-v2/dvbsky.c
@@ -31,7 +31,6 @@ MODULE_PARM_DESC(disable_rc, "Disable inbuilt IR receiver.");
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
 struct dvbsky_state {
-       struct mutex stream_mutex;
        u8 ibuf[DVBSKY_BUF_LEN];
        u8 obuf[DVBSKY_BUF_LEN];
        u8 last_lock;
@@ -68,18 +67,17 @@ static int dvbsky_usb_generic_rw(struct dvb_usb_device *d,
 
 static int dvbsky_stream_ctrl(struct dvb_usb_device *d, u8 onoff)
 {
-       struct dvbsky_state *state = d_to_priv(d);
        int ret;
-       u8 obuf_pre[3] = { 0x37, 0, 0 };
-       u8 obuf_post[3] = { 0x36, 3, 0 };
+       static u8 obuf_pre[3] = { 0x37, 0, 0 };
+       static u8 obuf_post[3] = { 0x36, 3, 0 };
 
-       mutex_lock(&state->stream_mutex);
-       ret = dvbsky_usb_generic_rw(d, obuf_pre, 3, NULL, 0);
+       mutex_lock(&d->usb_mutex);
+       ret = dvb_usbv2_generic_rw_locked(d, obuf_pre, 3, NULL, 0);
        if (!ret && onoff) {
                msleep(20);
-               ret = dvbsky_usb_generic_rw(d, obuf_post, 3, NULL, 0);
+               ret = dvb_usbv2_generic_rw_locked(d, obuf_post, 3, NULL, 0);
        }
-       mutex_unlock(&state->stream_mutex);
+       mutex_unlock(&d->usb_mutex);
        return ret;
 }
 
@@ -608,8 +606,6 @@ static int dvbsky_init(struct dvb_usb_device *d)
        if (ret)
                return ret;
        */
-       mutex_init(&state->stream_mutex);
-
        state->last_lock = 0;
 
        return 0;