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: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Finn Thain <fthain@linux-m68k.org>
Link: https://lore.kernel.org/r/20210727080840.3550927-3-u.kleine-koenig@pengutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/ethernet/8390/mac8390.c b/drivers/net/ethernet/8390/mac8390.c
index 9aac7119d3822a3ed0820c73bc2cc9b7133779b7..91b04abfd6875a62e4be9f63149334ed5c3064a0 100644 (file)
--- a/drivers/net/ethernet/8390/mac8390.c
+++ b/drivers/net/ethernet/8390/mac8390.c
@@ -428,13 +428,12 @@ out:
        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);
 
        unregister_netdev(dev);
        free_netdev(dev);
-       return 0;
 }
 
 static struct nubus_driver mac8390_driver = {

diff --git a/drivers/net/ethernet/natsemi/macsonic.c b/drivers/net/ethernet/natsemi/macsonic.c
index 2289e1fe37419a2ac447919b55e90ab0a14e6a85..8709d700e15a3b727c4f011f5ec66b7ad3a5f031 100644 (file)
--- a/drivers/net/ethernet/natsemi/macsonic.c
+++ b/drivers/net/ethernet/natsemi/macsonic.c
@@ -603,7 +603,7 @@ out:
        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 sonic_local *lp = netdev_priv(ndev);
@@ -613,8 +613,6 @@ static int mac_sonic_nubus_remove(struct nubus_board *board)
                          SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode),
                          lp->descriptors, lp->descriptors_laddr);
        free_netdev(ndev);
-
-       return 0;
 }
 
 static struct nubus_driver mac_sonic_nubus_driver = {

diff --git a/include/linux/nubus.h b/include/linux/nubus.h
index eba50b057f6f6071b3c7edba51c644540168e443..392fc6c53e9613081e9baef4d732876337546967 100644 (file)
--- a/include/linux/nubus.h
+++ b/include/linux/nubus.h
@@ -86,7 +86,7 @@ extern struct list_head nubus_func_rsrcs;
 struct nubus_driver {
        struct device_driver driver;
        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;