diff options
author | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-09-03 15:03:41 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-09-03 16:59:55 -0400 |
commit | f2747cf6f0a1110d132280d49ce3dd6886dacd85 (patch) | |
tree | 2d40096f081315dc35d987796b5e03e704689869 /drivers/media/rc | |
parent | fc823729e0b432a628d3f32e11dfa83a30de35aa (diff) |
[media] nuvoton-cir: just return 0 instead of using a var
Instead of allocating a var to store 0 and just return it,
change the code to return 0 directly.
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/rc')
-rw-r--r-- | drivers/media/rc/nuvoton-cir.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/rc/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c index 7f4fd859bba5..9c2c8635ff33 100644 --- a/drivers/media/rc/nuvoton-cir.c +++ b/drivers/media/rc/nuvoton-cir.c | |||
@@ -229,7 +229,6 @@ static int nvt_hw_detect(struct nvt_dev *nvt) | |||
229 | { | 229 | { |
230 | unsigned long flags; | 230 | unsigned long flags; |
231 | u8 chip_major, chip_minor; | 231 | u8 chip_major, chip_minor; |
232 | int ret = 0; | ||
233 | char chip_id[12]; | 232 | char chip_id[12]; |
234 | bool chip_unknown = false; | 233 | bool chip_unknown = false; |
235 | 234 | ||
@@ -285,7 +284,7 @@ static int nvt_hw_detect(struct nvt_dev *nvt) | |||
285 | nvt->chip_minor = chip_minor; | 284 | nvt->chip_minor = chip_minor; |
286 | spin_unlock_irqrestore(&nvt->nvt_lock, flags); | 285 | spin_unlock_irqrestore(&nvt->nvt_lock, flags); |
287 | 286 | ||
288 | return ret; | 287 | return 0; |
289 | } | 288 | } |
290 | 289 | ||
291 | static void nvt_cir_ldev_init(struct nvt_dev *nvt) | 290 | static void nvt_cir_ldev_init(struct nvt_dev *nvt) |
@@ -1177,7 +1176,6 @@ static int nvt_suspend(struct pnp_dev *pdev, pm_message_t state) | |||
1177 | 1176 | ||
1178 | static int nvt_resume(struct pnp_dev *pdev) | 1177 | static int nvt_resume(struct pnp_dev *pdev) |
1179 | { | 1178 | { |
1180 | int ret = 0; | ||
1181 | struct nvt_dev *nvt = pnp_get_drvdata(pdev); | 1179 | struct nvt_dev *nvt = pnp_get_drvdata(pdev); |
1182 | 1180 | ||
1183 | nvt_dbg("%s called", __func__); | 1181 | nvt_dbg("%s called", __func__); |
@@ -1195,7 +1193,7 @@ static int nvt_resume(struct pnp_dev *pdev) | |||
1195 | nvt_cir_regs_init(nvt); | 1193 | nvt_cir_regs_init(nvt); |
1196 | nvt_cir_wake_regs_init(nvt); | 1194 | nvt_cir_wake_regs_init(nvt); |
1197 | 1195 | ||
1198 | return ret; | 1196 | return 0; |
1199 | } | 1197 | } |
1200 | 1198 | ||
1201 | static void nvt_shutdown(struct pnp_dev *pdev) | 1199 | static void nvt_shutdown(struct pnp_dev *pdev) |