[media] media: rc: nuvoton-cir: make nvt_hw_detect void

[deliverable/linux.git] / drivers / media / rc / nuvoton-cir.c

diff --git a/drivers/media/rc/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c
index c5c238ba5618275e2a27d02c2e9e47eb1b2ad9a4..df4b9cbba6007deb40d03001a2d087df08729453 100644 (file)
--- 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);