mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-11-01 00:48:50 +00:00
Code Issues Releases Wiki Activity

[media] ds3000: remove useless 'locking'

Browse source 
Since b9bf2eafaa, the function
ds3000_firmware_ondemand() is called only once during init. This
locking scheme may have been useful when the firmware was loaded at
each tune.
Furthermore, it looks like this 'lock' was put in to prevent concurrent
access (and not recursion as the comments suggest). However, this open-
coded mechanism is anything but race-free and should have used a proper
mutex.

Signed-off-by: Rémi Cardona <remi.cardona@smartjog.com>
Reviewed-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Rémi Cardona 2012-09-28 08:59:27 -03:00 committed by Mauro Carvalho Chehab
parent feadd7d3ec
commit b41a536cf9
1 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/media/dvb-frontends/ds3000.c
View file

@ -30,7 +30,6 @@
#include "ds3000.h" #include "ds3000.h"
static int debug; static int debug;
static int force_fw_upload;
#define dprintk(args...) \ #define dprintk(args...) \
do { \ do { \
@ -234,7 +233,6 @@ struct ds3000_state {
struct i2c_adapter *i2c; struct i2c_adapter *i2c;
const struct ds3000_config *config; const struct ds3000_config *config;
struct dvb_frontend frontend; struct dvb_frontend frontend;
u8 skip_fw_load;
/* previous uncorrected block counter for DVB-S2 */ /* previous uncorrected block counter for DVB-S2 */
u16 prevUCBS2; u16 prevUCBS2;
}; };
@ -397,9 +395,6 @@ static int ds3000_firmware_ondemand(struct dvb_frontend *fe)
if (ret < 0) if (ret < 0)
return ret; return ret;
if (state->skip_fw_load || !force_fw_upload)
return 0; /* Firmware already uploaded, skipping */
/* Load firmware */ /* Load firmware */
/* request the firmware, this will block until someone uploads it */ /* request the firmware, this will block until someone uploads it */
printk(KERN_INFO "%s: Waiting for firmware upload (%s)...\n", __func__, printk(KERN_INFO "%s: Waiting for firmware upload (%s)...\n", __func__,
@ -413,9 +408,6 @@ static int ds3000_firmware_ondemand(struct dvb_frontend *fe)
return ret; return ret;
} }
/* Make sure we don't recurse back through here during loading */
state->skip_fw_load = 1;
ret = ds3000_load_firmware(fe, fw); ret = ds3000_load_firmware(fe, fw);
if (ret) if (ret)
printk("%s: Writing firmware to device failed\n", __func__); printk("%s: Writing firmware to device failed\n", __func__);
@ -425,9 +417,6 @@ static int ds3000_firmware_ondemand(struct dvb_frontend *fe)
dprintk("%s: Firmware upload %s\n", __func__, dprintk("%s: Firmware upload %s\n", __func__,
ret == 0 ? "complete" : "failed"); ret == 0 ? "complete" : "failed");
/* Ensure firmware is always loaded if required */
state->skip_fw_load = 0;
return ret; return ret;
} }
@ -1309,9 +1298,6 @@ static struct dvb_frontend_ops ds3000_ops = {
module_param(debug, int, 0644); module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, "Activates frontend debugging (default:0)"); MODULE_PARM_DESC(debug, "Activates frontend debugging (default:0)");
module_param(force_fw_upload, int, 0644);
MODULE_PARM_DESC(force_fw_upload, "Force firmware upload (default:0)");
MODULE_DESCRIPTION("DVB Frontend module for Montage Technology " MODULE_DESCRIPTION("DVB Frontend module for Montage Technology "
"DS3000/TS2020 hardware"); "DS3000/TS2020 hardware");
MODULE_AUTHOR("Konstantin Dimitrov"); MODULE_AUTHOR("Konstantin Dimitrov");