Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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 <dmitry.torokhov@gmail.com> (for drivers/input)
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Acked-by: Jiri Slaby <jirislaby@kernel.org>
Signed-off-by: Helge Deller <deller@gmx.de>

authored by

Uwe Kleine-König and committed by
Helge Deller
87875c10 d220da09

+17 -30
+2 -2
arch/parisc/include/asm/parisc-device.h
··· 34 34 struct parisc_driver *next; 35 35 char *name; 36 36 const struct parisc_device_id *id_table; 37 - int (*probe) (struct parisc_device *dev); /* New device discovered */ 38 - int (*remove) (struct parisc_device *dev); 37 + int (*probe)(struct parisc_device *dev); /* New device discovered */ 38 + void (*remove)(struct parisc_device *dev); 39 39 struct device_driver drv; 40 40 }; 41 41
+1 -1
drivers/char/ipmi/ipmi_si.h
··· 73 73 void ipmi_irq_start_cleanup(struct si_sm_io *io); 74 74 int ipmi_std_irq_setup(struct si_sm_io *io); 75 75 void ipmi_irq_finish_setup(struct si_sm_io *io); 76 - int ipmi_si_remove_by_dev(struct device *dev); 76 + void ipmi_si_remove_by_dev(struct device *dev); 77 77 struct device *ipmi_si_remove_by_data(int addr_space, enum si_type si_type, 78 78 unsigned long addr); 79 79 void ipmi_hardcode_init(void);
+1 -5
drivers/char/ipmi/ipmi_si_intf.c
··· 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,
+2 -2
drivers/char/ipmi/ipmi_si_parisc.c
··· 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 = {
+3 -1
drivers/char/ipmi/ipmi_si_platform.c
··· 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)
+1 -3
drivers/input/keyboard/hilkbd.c
··· 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 = {
+1 -2
drivers/input/serio/gscps2.c
··· 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 425 #endif 426 426 dev_set_drvdata(&dev->dev, NULL); 427 427 kfree(ps2port); 428 - return 0; 429 428 } 430 429 431 430
+1 -2
drivers/net/ethernet/i825xx/lasi_82596.c
··· 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 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 = {
+1 -2
drivers/parport/parport_gsc.c
··· 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 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 = {
+1 -3
drivers/scsi/lasi700.c
··· 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 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 = {
+1 -3
drivers/scsi/zalon.c
··· 168 168 169 169 MODULE_DEVICE_TABLE(parisc, zalon_tbl); 170 170 171 - static int __exit zalon_remove(struct parisc_device *dev) 171 + static void __exit zalon_remove(struct parisc_device *dev) 172 172 { 173 173 struct Scsi_Host *host = dev_get_drvdata(&dev->dev); 174 174 175 175 scsi_remove_host(host); 176 176 ncr53c8xx_release(host); 177 177 free_irq(dev->irq, host); 178 - 179 - return 0; 180 178 } 181 179 182 180 static struct parisc_driver zalon_driver __refdata = {
+1 -2
drivers/tty/serial/mux.c
··· 496 496 return 0; 497 497 } 498 498 499 - static int __exit mux_remove(struct parisc_device *dev) 499 + static void __exit mux_remove(struct parisc_device *dev) 500 500 { 501 501 int i, j; 502 502 int port_count = (long)dev_get_drvdata(&dev->dev); ··· 518 518 } 519 519 520 520 release_mem_region(dev->hpa.start + MUX_OFFSET, port_count * MUX_LINE_OFFSET); 521 - return 0; 522 521 } 523 522 524 523 /* Hack. This idea was taken from the 8250_gsc.c on how to properly order
+1 -2
sound/parisc/harmony.c
··· 968 968 return err; 969 969 } 970 970 971 - static int __exit 971 + static void __exit 972 972 snd_harmony_remove(struct parisc_device *padev) 973 973 { 974 974 snd_card_free(parisc_get_drvdata(padev)); 975 - return 0; 976 975 } 977 976 978 977 static struct parisc_driver snd_harmony_driver __refdata = {