Commit 0b9e69e1 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Jakub Kicinski
Browse files

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: default avatarStephen Rothwell <sfr@canb.auug.org.au>
[Rewrote commit message -- broonie]
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20220228173957.1262628-2-broonie@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e499cd31

drivers/net/ethernet/davicom/dm9051.c

+1 −3
Original line number Diff line number Diff line
@@ -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[] = {