Commit 87875c10 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Helge Deller
Browse files

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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: default avatarSudip Mukherjee <sudipm.mukherjee@gmail.com>
Acked-by: default avatarJiri Slaby <jirislaby@kernel.org>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent d220da09

arch/parisc/include/asm/parisc-device.h

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ struct parisc_driver { 
	char *name; 

	const struct parisc_device_id *id_table;

	int (*probe)(struct parisc_device *dev); /* New device discovered */

	int (*remove) (struct parisc_device *dev);

	void (*remove)(struct parisc_device *dev);

	struct device_driver drv;

};

drivers/char/ipmi/ipmi_si.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/char/ipmi/ipmi_si_intf.c

+1 −5
Original line number Diff line number Diff line
@@ -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,

drivers/char/ipmi/ipmi_si_parisc.c

+2 −2
Original line number Diff line number Diff line
@@ -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 = {

drivers/char/ipmi/ipmi_si_platform.c

+3 −1
Original line number Diff line number Diff line
@@ -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)