From: Stephen Rothwell Date: Mon, 28 Feb 2022 17:39:57 +0000 (+0000) Subject: net: dm9051: Make remove() callback a void function X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0b9e69e1a1e4d60473486d15217845ae1e151d4a;p=uclinux-h8%2Flinux.git net: dm9051: Make remove() callback a void function 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 [Rewrote commit message -- broonie] Signed-off-by: Mark Brown Link: https://lore.kernel.org/r/20220228173957.1262628-2-broonie@kernel.org Signed-off-by: Jakub Kicinski --- diff --git a/drivers/net/ethernet/davicom/dm9051.c b/drivers/net/ethernet/davicom/dm9051.c index b4b5c9c2a743..8ebcb35bbc0e 100644 --- a/drivers/net/ethernet/davicom/dm9051.c +++ b/drivers/net/ethernet/davicom/dm9051.c @@ -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[] = {