summaryrefslogtreecommitdiff
path: root/drivers/media/rc
diff options
context:
space:
mode:
authorHeiner Kallweit <hkallweit1@gmail.com>2015-10-30 00:22:00 +0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-11-19 14:35:54 +0300
commit6a5a336079abe8f991149ad84f648c54bfefde7a (patch)
tree9c29e9d86e614aee137cb84f08a586a7ee441525 /drivers/media/rc
parentb5cf725c04003edc4942057ae479f68826cee909 (diff)
downloadlinux-6a5a336079abe8f991149ad84f648c54bfefde7a.tar.xz
[media] media: rc: nuvoton-cir: make nvt_hw_detect void
nvt_hw_detect always returns 0, therefore make it return void. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/rc')
-rw-r--r--drivers/media/rc/nuvoton-cir.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/media/rc/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c
index c5c238ba5618..df4b9cbba600 100644
--- a/drivers/media/rc/nuvoton-cir.c
+++ b/drivers/media/rc/nuvoton-cir.c
@@ -250,7 +250,7 @@ static inline const char *nvt_find_chip(struct nvt_dev *nvt, int id)
/* detect hardware features */
-static int nvt_hw_detect(struct nvt_dev *nvt)
+static void nvt_hw_detect(struct nvt_dev *nvt)
{
const char *chip_name;
int chip_id;
@@ -281,8 +281,6 @@ static int nvt_hw_detect(struct nvt_dev *nvt)
chip_name, nvt->chip_major, nvt->chip_minor);
nvt_efm_disable(nvt);
-
- return 0;
}
static void nvt_cir_ldev_init(struct nvt_dev *nvt)
@@ -1024,9 +1022,7 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
init_waitqueue_head(&nvt->tx.queue);
- ret = nvt_hw_detect(nvt);
- if (ret)
- goto exit_free_dev_rdev;
+ nvt_hw_detect(nvt);
/* Initialize CIR & CIR Wake Logical Devices */
nvt_efm_enable(nvt);