Commit a7bdb9a9 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Greg Kroah-Hartman
Browse files

s390/cio: Make struct css_driver::remove return void 



The driver core ignores the return value of css_remove()
(because there is only little it can do when a device disappears) and
all callbacks return 0 anyhow.

So make it impossible for future drivers to return an unused error code
by changing the remove prototype to return void.

The real motivation for this change is the quest to make struct
bus_type::remove return void, too.

Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Acked-by: default avatarVineeth Vijayan <vneethv@linux.ibm.com>
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20210713193522.1770306-3-u.kleine-koenig@pengutronix.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dde0a318

drivers/s390/cio/chsc_sch.c

+1 −2
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static int chsc_subchannel_probe(struct subchannel *sch) 
	return ret;

}



static int chsc_subchannel_remove(struct subchannel *sch)

static void chsc_subchannel_remove(struct subchannel *sch)

{

	struct chsc_private *private;
@@ -112,7 +112,6 @@ static int chsc_subchannel_remove(struct subchannel *sch) 
		put_device(&sch->dev);

	}

	kfree(private);

	return 0;

}



static void chsc_subchannel_shutdown(struct subchannel *sch)

drivers/s390/cio/css.c

+4 −3
Original line number Diff line number Diff line
@@ -1374,12 +1374,13 @@ static int css_probe(struct device *dev) 
static int css_remove(struct device *dev)

{

	struct subchannel *sch;

	int ret;



	sch = to_subchannel(dev);

	ret = sch->driver->remove ? sch->driver->remove(sch) : 0;

	if (sch->driver->remove)

		sch->driver->remove(sch);

	sch->driver = NULL;

	return ret;



	return 0;

}



static void css_shutdown(struct device *dev)

drivers/s390/cio/css.h

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ struct css_driver { 
	int (*chp_event)(struct subchannel *, struct chp_link *, int);

	int (*sch_event)(struct subchannel *, int);

	int (*probe)(struct subchannel *);

	int (*remove)(struct subchannel *);

	void (*remove)(struct subchannel *);

	void (*shutdown)(struct subchannel *);

	int (*settle)(void);

};

drivers/s390/cio/device.c

+2 −3
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static int ccw_uevent(struct device *dev, struct kobj_uevent_env *env) 


static void io_subchannel_irq(struct subchannel *);

static int io_subchannel_probe(struct subchannel *);

static int io_subchannel_remove(struct subchannel *);

static void io_subchannel_remove(struct subchannel *);

static void io_subchannel_shutdown(struct subchannel *);

static int io_subchannel_sch_event(struct subchannel *, int);

static int io_subchannel_chp_event(struct subchannel *, struct chp_link *,
@@ -1101,7 +1101,7 @@ static int io_subchannel_probe(struct subchannel *sch) 
	return 0;

}



static int io_subchannel_remove(struct subchannel *sch)

static void io_subchannel_remove(struct subchannel *sch)

{

	struct io_subchannel_private *io_priv = to_io_private(sch);

	struct ccw_device *cdev;
@@ -1120,7 +1120,6 @@ static int io_subchannel_remove(struct subchannel *sch) 
			  io_priv->dma_area, io_priv->dma_area_dma);

	kfree(io_priv);

	sysfs_remove_group(&sch->dev.kobj, &io_subchannel_attr_group);

	return 0;

}



static void io_subchannel_verify(struct subchannel *sch)

drivers/s390/cio/eadm_sch.c

+1 −3
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ static void eadm_quiesce(struct subchannel *sch) 
	spin_unlock_irq(sch->lock);

}



static int eadm_subchannel_remove(struct subchannel *sch)

static void eadm_subchannel_remove(struct subchannel *sch)

{

	struct eadm_private *private = get_eadm_private(sch);
@@ -297,8 +297,6 @@ static int eadm_subchannel_remove(struct subchannel *sch) 
	spin_unlock_irq(sch->lock);



	kfree(private);



	return 0;

}



static void eadm_subchannel_shutdown(struct subchannel *sch)