[PATCH] net: dm9051: Make remove() callback a void function

[PATCH] net: dm9051: Make remove() callback a void function

[Mark Brown]

From: Stephen Rothwell <sfr@canb.auug.org.au>

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>
---
 drivers/net/ethernet/davicom/dm9051.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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[] = {
-- 
2.30.2

[PATCH] net: dm9051: Make remove() callback a void function

[Mark Brown]

From: Stephen Rothwell <sfr@canb.auug.org.au>

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>
---
 drivers/net/ethernet/davicom/dm9051.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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[] = {
-- 
2.30.2

Re: [PATCH] net: dm9051: Make remove() callback a void function

[Jakub Kicinski]

On Mon, 28 Feb 2022 17:39:57 +0000 Mark Brown wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> 
> 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>

Pulled & applied, thanks!

Re: [PATCH] net: dm9051: Make remove() callback a void function

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1001 bytes --]

Hi Jakub,

On Mon, 28 Feb 2022 11:49:13 -0800 Jakub Kicinski <kuba@kernel.org> wrote:
>
> On Mon, 28 Feb 2022 17:39:57 +0000 Mark Brown wrote:
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > 
> > 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>  
> 
> Pulled & applied, thanks!

For future reference, that patch of mine should have been applied as
part of the merge commit that brought in the topic branch.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH] net: dm9051: Make remove() callback a void function

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net-next.git (master)
by Jakub Kicinski <kuba@kernel.org>:

On Mon, 28 Feb 2022 17:39:57 +0000 you wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> 
> 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
> 
> [...]

Here is the summary with links:
  - net: dm9051: Make remove() callback a void function
    https://git.kernel.org/netdev/net-next/c/0b9e69e1a1e4

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html