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

nubus: Make struct nubus_driver::remove return void

The nubus core ignores the return value of the remove callback (in
nubus_device_remove()) and all implementers return 0 anyway.

So make it impossible for future drivers to return an unused error code
by changing the remove prototype to return void.
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: default avatarFinn Thain <fthain@linux-m68k.org>
Link: https://lore.kernel.org/r/20210727080840.3550927-3-u.kleine-koenig@pengutronix.deSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent df6192f4
...@@ -428,13 +428,12 @@ static int mac8390_device_probe(struct nubus_board *board) ...@@ -428,13 +428,12 @@ static int mac8390_device_probe(struct nubus_board *board)
return err; return err;
} }
static int mac8390_device_remove(struct nubus_board *board) static void mac8390_device_remove(struct nubus_board *board)
{ {
struct net_device *dev = nubus_get_drvdata(board); struct net_device *dev = nubus_get_drvdata(board);
unregister_netdev(dev); unregister_netdev(dev);
free_netdev(dev); free_netdev(dev);
return 0;
} }
static struct nubus_driver mac8390_driver = { static struct nubus_driver mac8390_driver = {
......
...@@ -603,7 +603,7 @@ static int mac_sonic_nubus_probe(struct nubus_board *board) ...@@ -603,7 +603,7 @@ static int mac_sonic_nubus_probe(struct nubus_board *board)
return err; return err;
} }
static int mac_sonic_nubus_remove(struct nubus_board *board) static void mac_sonic_nubus_remove(struct nubus_board *board)
{ {
struct net_device *ndev = nubus_get_drvdata(board); struct net_device *ndev = nubus_get_drvdata(board);
struct sonic_local *lp = netdev_priv(ndev); struct sonic_local *lp = netdev_priv(ndev);
...@@ -613,8 +613,6 @@ static int mac_sonic_nubus_remove(struct nubus_board *board) ...@@ -613,8 +613,6 @@ static int mac_sonic_nubus_remove(struct nubus_board *board)
SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode), SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode),
lp->descriptors, lp->descriptors_laddr); lp->descriptors, lp->descriptors_laddr);
free_netdev(ndev); free_netdev(ndev);
return 0;
} }
static struct nubus_driver mac_sonic_nubus_driver = { static struct nubus_driver mac_sonic_nubus_driver = {
......
...@@ -86,7 +86,7 @@ extern struct list_head nubus_func_rsrcs; ...@@ -86,7 +86,7 @@ extern struct list_head nubus_func_rsrcs;
struct nubus_driver { struct nubus_driver {
struct device_driver driver; struct device_driver driver;
int (*probe)(struct nubus_board *board); int (*probe)(struct nubus_board *board);
int (*remove)(struct nubus_board *board); void (*remove)(struct nubus_board *board);
}; };
extern struct bus_type nubus_bus_type; extern struct bus_type nubus_bus_type;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment