From: Heiner Kallweit Date: Thu, 29 Oct 2015 21:22:00 +0000 (-0200) Subject: [media] media: rc: nuvoton-cir: make nvt_hw_detect void X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6a5a336079abe8f991149ad84f648c54bfefde7a;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git [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 Signed-off-by: Mauro Carvalho Chehab --- 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);