parisc: Make struct parisc_driver::remove() return void

Uwe Kleine-König · hdeller · commit 87875c1084a2 · 2021-08-30T10:18:25.000+02:00
The caller of this function (parisc_driver_remove() in
arch/parisc/kernel/drivers.c) ignores the return value, so better don't
return any value at all to not wake wrong expectations in driver authors.

The only function that could return a non-zero value before was
ipmi_parisc_remove() which returns the return value of
ipmi_si_remove_by_dev(). Make this function return void, too, as for all
other callers the value is ignored, too.

Also fold in a small checkpatch fix for:

WARNING: Unnecessary space before function pointer arguments
+	void (*remove) (struct parisc_device *dev);

Acked-by: Dmitry Torokhov &lt;dmitry.torokhov@gmail.com&gt; (for drivers/input)
Signed-off-by: Uwe Kleine-König &lt;u.kleine-koenig@pengutronix.de&gt;
Acked-by:  Sudip Mukherjee &lt;sudipm.mukherjee@gmail.com&gt;
Acked-by: Jiri Slaby &lt;jirislaby@kernel.org&gt;
Signed-off-by: Helge Deller &lt;deller@gmx.de&gt;
diff --git a/arch/parisc/include/asm/parisc-device.h b/arch/parisc/include/asm/parisc-device.h
@@ -34,8 +34,8 @@ struct parisc_driver {
 	struct parisc_driver *next;
 	char *name; 
 	const struct parisc_device_id *id_table;
-	int (*probe) (struct parisc_device *dev); /* New device discovered */
-	int (*remove) (struct parisc_device *dev);
+	int (*probe)(struct parisc_device *dev); /* New device discovered */
+	void (*remove)(struct parisc_device *dev);
 	struct device_driver drv;
 };
 
diff --git a/drivers/char/ipmi/ipmi_si.h b/drivers/char/ipmi/ipmi_si.h
@@ -73,7 +73,7 @@ irqreturn_t ipmi_si_irq_handler(int irq, void *data);
 void ipmi_irq_start_cleanup(struct si_sm_io *io);
 int ipmi_std_irq_setup(struct si_sm_io *io);
 void ipmi_irq_finish_setup(struct si_sm_io *io);
-int ipmi_si_remove_by_dev(struct device *dev);
+void ipmi_si_remove_by_dev(struct device *dev);
 struct device *ipmi_si_remove_by_data(int addr_space, enum si_type si_type,
 				      unsigned long addr);
 void ipmi_hardcode_init(void);
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
@@ -2228,22 +2228,18 @@ static void cleanup_one_si(struct smi_info *smi_info)
 	kfree(smi_info);
 }
 
-int ipmi_si_remove_by_dev(struct device *dev)
+void ipmi_si_remove_by_dev(struct device *dev)
 {
 	struct smi_info *e;
-	int rv = -ENOENT;
 
 	mutex_lock(&smi_infos_lock);
 	list_for_each_entry(e, &smi_infos, link) {
 		if (e->io.dev == dev) {
 			cleanup_one_si(e);
-			rv = 0;
 			break;
 		}
 	}
 	mutex_unlock(&smi_infos_lock);
-
-	return rv;
 }
 
 struct device *ipmi_si_remove_by_data(int addr_space, enum si_type si_type,
diff --git a/drivers/char/ipmi/ipmi_si_parisc.c b/drivers/char/ipmi/ipmi_si_parisc.c
@@ -29,9 +29,9 @@ static int __init ipmi_parisc_probe(struct parisc_device *dev)
 	return ipmi_si_add_smi(&io);
 }
 
-static int __exit ipmi_parisc_remove(struct parisc_device *dev)
+static void __exit ipmi_parisc_remove(struct parisc_device *dev)
 {
-	return ipmi_si_remove_by_dev(&dev->dev);
+	ipmi_si_remove_by_dev(&dev->dev);
 }
 
 static const struct parisc_device_id ipmi_parisc_tbl[] __initconst = {
diff --git a/drivers/char/ipmi/ipmi_si_platform.c b/drivers/char/ipmi/ipmi_si_platform.c
@@ -411,7 +411,9 @@ static int ipmi_probe(struct platform_device *pdev)
 
 static int ipmi_remove(struct platform_device *pdev)
 {
-	return ipmi_si_remove_by_dev(&pdev->dev);
+	ipmi_si_remove_by_dev(&pdev->dev);
+
+	return 0;
 }
 
 static int pdev_match_name(struct device *dev, const void *data)
diff --git a/drivers/input/keyboard/hilkbd.c b/drivers/input/keyboard/hilkbd.c
@@ -316,11 +316,9 @@ static int __init hil_probe_chip(struct parisc_device *dev)
 	return hil_keyb_init();
 }
 
-static int __exit hil_remove_chip(struct parisc_device *dev)
+static void __exit hil_remove_chip(struct parisc_device *dev)
 {
 	hil_keyb_exit();
-
-	return 0;
 }
 
 static const struct parisc_device_id hil_tbl[] __initconst = {
diff --git a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c
@@ -411,7 +411,7 @@ static int __init gscps2_probe(struct parisc_device *dev)
  * @return: success/error report
  */
 
-static int __exit gscps2_remove(struct parisc_device *dev)
+static void __exit gscps2_remove(struct parisc_device *dev)
 {
 	struct gscps2port *ps2port = dev_get_drvdata(&dev->dev);
 
@@ -425,7 +425,6 @@ static int __exit gscps2_remove(struct parisc_device *dev)
 #endif
 	dev_set_drvdata(&dev->dev, NULL);
 	kfree(ps2port);
-	return 0;
 }
 
 
diff --git a/drivers/net/ethernet/i825xx/lasi_82596.c b/drivers/net/ethernet/i825xx/lasi_82596.c
@@ -196,7 +196,7 @@ lan_init_chip(struct parisc_device *dev)
 	return retval;
 }
 
-static int __exit lan_remove_chip(struct parisc_device *pdev)
+static void __exit lan_remove_chip(struct parisc_device *pdev)
 {
 	struct net_device *dev = parisc_get_drvdata(pdev);
 	struct i596_private *lp = netdev_priv(dev);
@@ -205,7 +205,6 @@ static int __exit lan_remove_chip(struct parisc_device *pdev)
 	dma_free_noncoherent(&pdev->dev, sizeof(struct i596_private), lp->dma,
 		       lp->dma_addr, DMA_BIDIRECTIONAL);
 	free_netdev (dev);
-	return 0;
 }
 
 static const struct parisc_device_id lan_tbl[] __initconst = {
diff --git a/drivers/parport/parport_gsc.c b/drivers/parport/parport_gsc.c
@@ -378,7 +378,7 @@ static int __init parport_init_chip(struct parisc_device *dev)
 	return 0;
 }
 
-static int __exit parport_remove_chip(struct parisc_device *dev)
+static void __exit parport_remove_chip(struct parisc_device *dev)
 {
 	struct parport *p = dev_get_drvdata(&dev->dev);
 	if (p) {
@@ -397,7 +397,6 @@ static int __exit parport_remove_chip(struct parisc_device *dev)
 		parport_put_port(p);
 		kfree (ops); /* hope no-one cached it */
 	}
-	return 0;
 }
 
 static const struct parisc_device_id parport_tbl[] __initconst = {
diff --git a/drivers/scsi/lasi700.c b/drivers/scsi/lasi700.c
@@ -134,7 +134,7 @@ lasi700_probe(struct parisc_device *dev)
 	return -ENODEV;
 }
 
-static int __exit
+static void __exit
 lasi700_driver_remove(struct parisc_device *dev)
 {
 	struct Scsi_Host *host = dev_get_drvdata(&dev->dev);
@@ -146,8 +146,6 @@ lasi700_driver_remove(struct parisc_device *dev)
 	free_irq(host->irq, host);
 	iounmap(hostdata->base);
 	kfree(hostdata);
-
-	return 0;
 }
 
 static struct parisc_driver lasi700_driver __refdata = {
diff --git a/drivers/scsi/zalon.c b/drivers/scsi/zalon.c
@@ -168,15 +168,13 @@ static const struct parisc_device_id zalon_tbl[] __initconst = {
 
 MODULE_DEVICE_TABLE(parisc, zalon_tbl);
 
-static int __exit zalon_remove(struct parisc_device *dev)
+static void __exit zalon_remove(struct parisc_device *dev)
 {
 	struct Scsi_Host *host = dev_get_drvdata(&dev->dev);
 
 	scsi_remove_host(host);
 	ncr53c8xx_release(host);
 	free_irq(dev->irq, host);
-
-	return 0;
 }
 
 static struct parisc_driver zalon_driver __refdata = {
diff --git a/drivers/tty/serial/mux.c b/drivers/tty/serial/mux.c
@@ -496,7 +496,7 @@ static int __init mux_probe(struct parisc_device *dev)
 	return 0;
 }
 
-static int __exit mux_remove(struct parisc_device *dev)
+static void __exit mux_remove(struct parisc_device *dev)
 {
 	int i, j;
 	int port_count = (long)dev_get_drvdata(&dev->dev);
@@ -518,7 +518,6 @@ static int __exit mux_remove(struct parisc_device *dev)
 	}
 
 	release_mem_region(dev->hpa.start + MUX_OFFSET, port_count * MUX_LINE_OFFSET);
-	return 0;
 }
 
 /* Hack.  This idea was taken from the 8250_gsc.c on how to properly order
diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c
@@ -968,11 +968,10 @@ snd_harmony_probe(struct parisc_device *padev)
 	return err;
 }
 
-static int __exit
+static void __exit
 snd_harmony_remove(struct parisc_device *padev)
 {
 	snd_card_free(parisc_get_drvdata(padev));
-	return 0;
 }
 
 static struct parisc_driver snd_harmony_driver __refdata = {

Original file line number	Diff line number	Diff line change
`@@ -2228,22 +2228,18 @@ static void cleanup_one_si(struct smi_info *smi_info)`
`2228`	`2228`	`kfree(smi_info);`
`2229`	`2229`	`}`
`2230`	`2230`
`2231`		`-int ipmi_si_remove_by_dev(struct device *dev)`
	`2231`	`+void ipmi_si_remove_by_dev(struct device *dev)`
`2232`	`2232`	`{`
`2233`	`2233`	`struct smi_info *e;`
`2234`		`- int rv = -ENOENT;`
`2235`	`2234`
`2236`	`2235`	`mutex_lock(&smi_infos_lock);`
`2237`	`2236`	`list_for_each_entry(e, &smi_infos, link) {`
`2238`	`2237`	`if (e->io.dev == dev) {`
`2239`	`2238`	`cleanup_one_si(e);`
`2240`		`- rv = 0;`
`2241`	`2239`	`break;`
`2242`	`2240`	`}`
`2243`	`2241`	`}`
`2244`	`2242`	`mutex_unlock(&smi_infos_lock);`
`2245`		`-`
`2246`		`- return rv;`
`2247`	`2243`	`}`
`2248`	`2244`
`2249`	`2245`	`struct device *ipmi_si_remove_by_data(int addr_space, enum si_type si_type,`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,9 @@ static int __init ipmi_parisc_probe(struct parisc_device *dev)`
`29`	`29`	`return ipmi_si_add_smi(&io);`
`30`	`30`	`}`
`31`	`31`
`32`		`-static int __exit ipmi_parisc_remove(struct parisc_device *dev)`
	`32`	`+static void __exit ipmi_parisc_remove(struct parisc_device *dev)`
`33`	`33`	`{`
`34`		`- return ipmi_si_remove_by_dev(&dev->dev);`
	`34`	`+ ipmi_si_remove_by_dev(&dev->dev);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`static const struct parisc_device_id ipmi_parisc_tbl[] __initconst = {`
Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,9 @@ static int ipmi_probe(struct platform_device *pdev)`
`411`	`411`
`412`	`412`	`static int ipmi_remove(struct platform_device *pdev)`
`413`	`413`	`{`
`414`		`- return ipmi_si_remove_by_dev(&pdev->dev);`
	`414`	`+ ipmi_si_remove_by_dev(&pdev->dev);`
	`415`	`+`
	`416`	`+ return 0;`
`415`	`417`	`}`
`416`	`418`
`417`	`419`	`static int pdev_match_name(struct device dev, const void data)`
Original file line number	Diff line number	Diff line change
`@@ -316,11 +316,9 @@ static int __init hil_probe_chip(struct parisc_device *dev)`
`316`	`316`	`return hil_keyb_init();`
`317`	`317`	`}`
`318`	`318`
`319`		`-static int __exit hil_remove_chip(struct parisc_device *dev)`
	`319`	`+static void __exit hil_remove_chip(struct parisc_device *dev)`
`320`	`320`	`{`
`321`	`321`	`hil_keyb_exit();`
`322`		`-`
`323`		`- return 0;`
`324`	`322`	`}`
`325`	`323`
`326`	`324`	`static const struct parisc_device_id hil_tbl[] __initconst = {`
Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,7 @@ static int __init gscps2_probe(struct parisc_device *dev)`
`411`	`411`	`* @return: success/error report`
`412`	`412`	`*/`
`413`	`413`
`414`		`-static int __exit gscps2_remove(struct parisc_device *dev)`
	`414`	`+static void __exit gscps2_remove(struct parisc_device *dev)`
`415`	`415`	`{`
`416`	`416`	`struct gscps2port *ps2port = dev_get_drvdata(&dev->dev);`
`417`	`417`
`@@ -425,7 +425,6 @@ static int __exit gscps2_remove(struct parisc_device *dev)`
`425`	`425`	`#endif`
`426`	`426`	`dev_set_drvdata(&dev->dev, NULL);`
`427`	`427`	`kfree(ps2port);`
`428`		`- return 0;`
`429`	`428`	`}`
`430`	`429`
`431`	`430`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ lan_init_chip(struct parisc_device *dev)`
`196`	`196`	`return retval;`
`197`	`197`	`}`
`198`	`198`
`199`		`-static int __exit lan_remove_chip(struct parisc_device *pdev)`
	`199`	`+static void __exit lan_remove_chip(struct parisc_device *pdev)`
`200`	`200`	`{`
`201`	`201`	`struct net_device *dev = parisc_get_drvdata(pdev);`
`202`	`202`	`struct i596_private *lp = netdev_priv(dev);`
`@@ -205,7 +205,6 @@ static int __exit lan_remove_chip(struct parisc_device *pdev)`
`205`	`205`	`dma_free_noncoherent(&pdev->dev, sizeof(struct i596_private), lp->dma,`
`206`	`206`	`lp->dma_addr, DMA_BIDIRECTIONAL);`
`207`	`207`	`free_netdev (dev);`
`208`		`- return 0;`
`209`	`208`	`}`
`210`	`209`
`211`	`210`	`static const struct parisc_device_id lan_tbl[] __initconst = {`
Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,7 @@ static int __init parport_init_chip(struct parisc_device *dev)`
`378`	`378`	`return 0;`
`379`	`379`	`}`
`380`	`380`
`381`		`-static int __exit parport_remove_chip(struct parisc_device *dev)`
	`381`	`+static void __exit parport_remove_chip(struct parisc_device *dev)`
`382`	`382`	`{`
`383`	`383`	`struct parport *p = dev_get_drvdata(&dev->dev);`
`384`	`384`	`if (p) {`
`@@ -397,7 +397,6 @@ static int __exit parport_remove_chip(struct parisc_device *dev)`
`397`	`397`	`parport_put_port(p);`
`398`	`398`	`kfree (ops); /* hope no-one cached it */`
`399`	`399`	`}`
`400`		`- return 0;`
`401`	`400`	`}`
`402`	`401`
`403`	`402`	`static const struct parisc_device_id parport_tbl[] __initconst = {`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ lasi700_probe(struct parisc_device *dev)`
`134`	`134`	`return -ENODEV;`
`135`	`135`	`}`
`136`	`136`
`137`		`-static int __exit`
	`137`	`+static void __exit`
`138`	`138`	`lasi700_driver_remove(struct parisc_device *dev)`
`139`	`139`	`{`
`140`	`140`	`struct Scsi_Host *host = dev_get_drvdata(&dev->dev);`
`@@ -146,8 +146,6 @@ lasi700_driver_remove(struct parisc_device *dev)`
`146`	`146`	`free_irq(host->irq, host);`
`147`	`147`	`iounmap(hostdata->base);`
`148`	`148`	`kfree(hostdata);`
`149`		`-`
`150`		`- return 0;`
`151`	`149`	`}`
`152`	`150`
`153`	`151`	`static struct parisc_driver lasi700_driver __refdata = {`