korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-28 22:54:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

sparc/vio: make remove callback return void

Browse Source 
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: David S. Miller <davem@davemloft.net>
Signed-off-by: Uwe 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Uwe Kleine-König 2021-05-05 22:14:49 +02:00 committed by Greg Kroah-Hartman
parent a56dfb6a79
commit 1553573c58
7 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sparc/include/asm/vio.h
View File

@ -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;

6
arch/sparc/kernel/ds.c
View File

@ -1236,11 +1236,6 @@ out_err:
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",
};

4
arch/sparc/kernel/vio.c
View File

@ -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,

3
drivers/block/sunvdc.c
View File

@ -1071,7 +1071,7 @@ err_out_release_mdesc:
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)

4
drivers/net/ethernet/sun/ldmvsw.c
View File

@ -404,7 +404,7 @@ err_out_free_dev:
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)

3
drivers/net/ethernet/sun/sunvnet.c
View File

@ -510,7 +510,7 @@ err_out_put_mdesc:
return err;
}
static int vnet_port_remove(struct vio_dev *vdev)
static void vnet_port_remove(struct vio_dev *vdev)
{
struct vnet_port *port = dev_get_drvdata(&vdev->dev);
@ -533,7 +533,6 @@ static int vnet_port_remove(struct vio_dev *vdev)
kfree(port);
}
return 0;
}
static const struct vio_device_id vnet_port_match[] = {

4
drivers/tty/vcc.c
View File

@ -668,7 +668,7 @@ free_port:
*
* Return: status of removal
*/
static int vcc_remove(struct vio_dev *vdev)
static void vcc_remove(struct vio_dev *vdev)
{
struct vcc_port *port = dev_get_drvdata(&vdev->dev);
@ -703,8 +703,6 @@ static int vcc_remove(struct vio_dev *vdev)
kfree(port->domain);
kfree(port);
}
return 0;
}
static const struct vio_device_id vcc_match[] = {