diff options
Diffstat (limited to 'drivers/media/dvb-frontends')
| -rw-r--r-- | drivers/media/dvb-frontends/drx39xyj/drxj.c | 2 | ||||
| -rw-r--r-- | drivers/media/dvb-frontends/drxk_hard.c | 2 | ||||
| -rw-r--r-- | drivers/media/dvb-frontends/rtl2832_sdr.c | 6 | ||||
| -rw-r--r-- | drivers/media/dvb-frontends/zd1301_demod.c | 6 |
4 files changed, 6 insertions, 10 deletions
diff --git a/drivers/media/dvb-frontends/drx39xyj/drxj.c b/drivers/media/dvb-frontends/drx39xyj/drxj.c index 6bf6559b127f..68f4e8b5a0ab 100644 --- a/drivers/media/dvb-frontends/drx39xyj/drxj.c +++ b/drivers/media/dvb-frontends/drx39xyj/drxj.c @@ -11070,7 +11070,7 @@ ctrl_power_mode(struct drx_demod_instance *demod, enum drx_power_mode *mode) sio_cc_pwd_mode = SIO_CC_PWD_MODE_LEVEL_OSC; break; default: - /* Unknow sleep mode */ + /* Unknown sleep mode */ return -EINVAL; } diff --git a/drivers/media/dvb-frontends/drxk_hard.c b/drivers/media/dvb-frontends/drxk_hard.c index 9807f5411996..3301ef75d441 100644 --- a/drivers/media/dvb-frontends/drxk_hard.c +++ b/drivers/media/dvb-frontends/drxk_hard.c @@ -1585,7 +1585,7 @@ static int ctrl_power_mode(struct drxk_state *state, enum drx_power_mode *mode) sio_cc_pwd_mode = SIO_CC_PWD_MODE_LEVEL_OSC; break; default: - /* Unknow sleep mode */ + /* Unknown sleep mode */ return -EINVAL; } diff --git a/drivers/media/dvb-frontends/rtl2832_sdr.c b/drivers/media/dvb-frontends/rtl2832_sdr.c index 05f71d169726..02c619e51641 100644 --- a/drivers/media/dvb-frontends/rtl2832_sdr.c +++ b/drivers/media/dvb-frontends/rtl2832_sdr.c @@ -1463,7 +1463,7 @@ err: return ret; } -static int rtl2832_sdr_remove(struct platform_device *pdev) +static void rtl2832_sdr_remove(struct platform_device *pdev) { struct rtl2832_sdr_dev *dev = platform_get_drvdata(pdev); @@ -1479,8 +1479,6 @@ static int rtl2832_sdr_remove(struct platform_device *pdev) mutex_unlock(&dev->vb_queue_lock); v4l2_device_put(&dev->v4l2_dev); module_put(pdev->dev.parent->driver->owner); - - return 0; } static struct platform_driver rtl2832_sdr_driver = { @@ -1488,7 +1486,7 @@ static struct platform_driver rtl2832_sdr_driver = { .name = "rtl2832_sdr", }, .probe = rtl2832_sdr_probe, - .remove = rtl2832_sdr_remove, + .remove_new = rtl2832_sdr_remove, }; module_platform_driver(rtl2832_sdr_driver); diff --git a/drivers/media/dvb-frontends/zd1301_demod.c b/drivers/media/dvb-frontends/zd1301_demod.c index bbabe6a2d4f4..17f6e373c13d 100644 --- a/drivers/media/dvb-frontends/zd1301_demod.c +++ b/drivers/media/dvb-frontends/zd1301_demod.c @@ -515,7 +515,7 @@ err: return ret; } -static int zd1301_demod_remove(struct platform_device *pdev) +static void zd1301_demod_remove(struct platform_device *pdev) { struct zd1301_demod_dev *dev = platform_get_drvdata(pdev); @@ -523,8 +523,6 @@ static int zd1301_demod_remove(struct platform_device *pdev) i2c_del_adapter(&dev->adapter); kfree(dev); - - return 0; } static struct platform_driver zd1301_demod_driver = { @@ -533,7 +531,7 @@ static struct platform_driver zd1301_demod_driver = { .suppress_bind_attrs = true, }, .probe = zd1301_demod_probe, - .remove = zd1301_demod_remove, + .remove_new = zd1301_demod_remove, }; module_platform_driver(zd1301_demod_driver); |