net: dm9051: Make remove() callback a void function
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 28 Feb 2022 17:39:57 +0000 (17:39 +0000)
committerJakub Kicinski <kuba@kernel.org>
Mon, 28 Feb 2022 18:45:02 +0000 (10:45 -0800)
Changes introduced since the merge window in the spi subsystem and
available at:

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git tags/spi-remove-void

make the remove() callback for spi return void rather than int, breaking
the newly added dm9051 driver fail to build.  This patch fixes this
issue, converting the remove() function provided by the driver to return
void.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
[Rewrote commit message -- broonie]
Signed-off-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20220228173957.1262628-2-broonie@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/davicom/dm9051.c

index b4b5c9c..8ebcb35 100644 (file)
@@ -1225,15 +1225,13 @@ static int dm9051_probe(struct spi_device *spi)
        return 0;
 }
 
-static int dm9051_drv_remove(struct spi_device *spi)
+static void dm9051_drv_remove(struct spi_device *spi)
 {
        struct device *dev = &spi->dev;
        struct net_device *ndev = dev_get_drvdata(dev);
        struct board_info *db = to_dm9051_board(ndev);
 
        phy_disconnect(db->phydev);
-
-       return 0;
 }
 
 static const struct of_device_id dm9051_match_table[] = {