Skip to content

Commit

Permalink
sparc/vio: make remove callback return void
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Uwe Kleine-König authored and Greg Kroah-Hartman committed May 14, 2021
1 parent a56dfb6 commit 1553573
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 19 deletions.
2 changes: 1 addition & 1 deletion arch/sparc/include/asm/vio.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 0 additions & 6 deletions arch/sparc/kernel/ds.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
};

Expand Down
4 changes: 2 additions & 2 deletions arch/sparc/kernel/vio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 1 addition & 2 deletions drivers/block/sunvdc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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)
Expand Down
4 changes: 1 addition & 3 deletions drivers/net/ethernet/sun/ldmvsw.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -430,8 +430,6 @@ static int vsw_port_remove(struct vio_dev *vdev)

free_netdev(port->dev);
}

return 0;
}

static void vsw_cleanup(void)
Expand Down
3 changes: 1 addition & 2 deletions drivers/net/ethernet/sun/sunvnet.c
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ static int vnet_port_probe(struct vio_dev *vdev, const struct vio_device_id *id)
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);

Expand All @@ -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[] = {
Expand Down
4 changes: 1 addition & 3 deletions drivers/tty/vcc.c
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@ static int vcc_probe(struct vio_dev *vdev, const struct vio_device_id *id)
*
* 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);

Expand Down Expand Up @@ -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[] = {
Expand Down

0 comments on commit 1553573

Please sign in to comment.