Skip to contentSkip to conversation

media: rc: nuvoton-cir: make nvt_hw_detect void

PATCH New Heiner Kallweit 1 participant 1 message Oct 29, 2015

Subsystems (2)
Media (V4L/DVB) RC-core / lirc framework
lore
Share & tools
lore

Heiner Kallweit

author
#0 lore raw

PATCH 5/9 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 <[email protected]>
---
 drivers/media/rc/nuvoton-cir.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/media/rc/nuvoton-cir.c +2 -6
index c5c238b..df4b9cb 100644
@@ -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);
Signature · 1 line
2.6.2