History

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.

Mauro Carvalho Chehab committed 8 years ago

Commit 7d95fb71 parent 3b7158d1 file · +6 −10Browse files

Unified · Split

drivers/media/usb/dvb-usb-v2/dvbsky.c+6−10
@@ -31,7 +31,6 @@ MODULE_PARM_DESC(disable_rc, "Disable inbuilt IR receiver."); · 30 unmodified lines
31DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);31DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
32 32
33struct dvbsky_state {33struct dvbsky_state {
34 struct mutex stream_mutex;
35 u8 ibuf[DVBSKY_BUF_LEN];34 u8 ibuf[DVBSKY_BUF_LEN];
36 u8 obuf[DVBSKY_BUF_LEN];35 u8 obuf[DVBSKY_BUF_LEN];
37 u8 last_lock;36 u8 last_lock;
@@ -68,18 +67,17 @@ static int dvbsky_usb_generic_rw(struct dvb_usb_device *d, · 30 unmodified lines
68 67
69static int dvbsky_stream_ctrl(struct dvb_usb_device *d, u8 onoff)68static int dvbsky_stream_ctrl(struct dvb_usb_device *d, u8 onoff)
70{69{
71 struct dvbsky_state *state = d_to_priv(d);
72 int ret;70 int ret;
73 u8 obuf_pre[3] = { 0x37, 0, 0 };71 static u8 obuf_pre[3] = { 0x37, 0, 0 };
74 u8 obuf_post[3] = { 0x36, 3, 0 };72 static u8 obuf_post[3] = { 0x36, 3, 0 };
75 73
76 mutex_lock(&state->stream_mutex);74 mutex_lock(&d->usb_mutex);
77 ret = dvbsky_usb_generic_rw(d, obuf_pre, 3, NULL, 0);75 ret = dvb_usbv2_generic_rw_locked(d, obuf_pre, 3, NULL, 0);
78 if (!ret && onoff) {76 if (!ret && onoff) {
79 msleep(20);77 msleep(20);
80 ret = dvbsky_usb_generic_rw(d, obuf_post, 3, NULL, 0);78 ret = dvb_usbv2_generic_rw_locked(d, obuf_post, 3, NULL, 0);
81 }79 }
82 mutex_unlock(&state->stream_mutex);80 mutex_unlock(&d->usb_mutex);
83 return ret;81 return ret;
84}82}
85 83
@@ -608,8 +606,6 @@ static int dvbsky_init(struct dvb_usb_device *d) · 522 unmodified lines
608 if (ret)606 if (ret)
609 return ret;607 return ret;
610 */608 */
611 mutex_init(&state->stream_mutex);
612
613 state->last_lock = 0;609 state->last_lock = 0;
614 610
615 return 0;611 return 0;