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

sparc/vio: make remove callback return void 



The driver core ignores the return value of struct bus_type::remove()
because there is only little that can be done. To simplify the quest to
make this function return void, let struct vio_driver::remove() return
void, too. All users already unconditionally return 0, this commit makes
it obvious that returning an error code is a bad idea and should prevent
that future driver authors consider returning an error code.

Note there are two nominally different implementations for a vio bus:
one in arch/sparc/kernel/vio.c and the other in
arch/powerpc/platforms/pseries/vio.c. This patch only addresses the
former.

Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20210505201449.195627-1-u.kleine-koenig@pengutronix.de


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

arch/sparc/include/asm/vio.h

+1 −1
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ struct vio_driver { 
	struct list_head		node;

	const struct vio_device_id	*id_table;

	int (*probe)(struct vio_dev *dev, const struct vio_device_id *id);

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

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

	void (*shutdown)(struct vio_dev *dev);

	unsigned long			driver_data;

	struct device_driver		driver;

arch/sparc/kernel/ds.c

+0 −6
Original line number Diff line number Diff line
@@ -1236,11 +1236,6 @@ static int ds_probe(struct vio_dev *vdev, const struct vio_device_id *id) 
	return err;

}



static int ds_remove(struct vio_dev *vdev)

{

	return 0;

}



static const struct vio_device_id ds_match[] = {

	{

		.type = "domain-services-port",
@@ -1251,7 +1246,6 @@ static const struct vio_device_id ds_match[] = { 
static struct vio_driver ds_driver = {

	.id_table	= ds_match,

	.probe		= ds_probe,

	.remove		= ds_remove,

	.name		= "ds",

};

arch/sparc/kernel/vio.c

+2 −2
Original line number Diff line number Diff line
@@ -105,10 +105,10 @@ static int vio_device_remove(struct device *dev) 
		 * routines to do so at the moment. TBD

		 */



		return drv->remove(vdev);

		drv->remove(vdev);

	}



	return 1;

	return 0;

}



static ssize_t devspec_show(struct device *dev,

drivers/block/sunvdc.c

+1 −2
Original line number Diff line number Diff line
@@ -1071,7 +1071,7 @@ static int vdc_port_probe(struct vio_dev *vdev, const struct vio_device_id *id) 
	return err;

}



static int vdc_port_remove(struct vio_dev *vdev)

static void vdc_port_remove(struct vio_dev *vdev)

{

	struct vdc_port *port = dev_get_drvdata(&vdev->dev);
@@ -1094,7 +1094,6 @@ static int vdc_port_remove(struct vio_dev *vdev) 


		kfree(port);

	}

	return 0;

}



static void vdc_requeue_inflight(struct vdc_port *port)

drivers/net/ethernet/sun/ldmvsw.c

+1 −3
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ static int vsw_port_probe(struct vio_dev *vdev, const struct vio_device_id *id) 
	return err;

}



static int vsw_port_remove(struct vio_dev *vdev)

static void vsw_port_remove(struct vio_dev *vdev)

{

	struct vnet_port *port = dev_get_drvdata(&vdev->dev);

	unsigned long flags;
@@ -430,8 +430,6 @@ static int vsw_port_remove(struct vio_dev *vdev) 


		free_netdev(port->dev);

	}



	return 0;

}



static void vsw_cleanup(void)