diff mbox series

net: dm9051: Make remove() callback a void function

Message ID 20220228173957.1262628-2-broonie@kernel.org (mailing list archive)
State Accepted
Commit 0b9e69e1a1e4d60473486d15217845ae1e151d4a
Delegated to: Netdev Maintainers
Headers show
Series net: dm9051: Make remove() callback a void function | expand

Checks

Context Check Description
netdev/fixes_present success Fixes tag not required for -next series
netdev/subject_prefix warning Target tree name not specified in the subject
netdev/cover_letter success Single patches do not need cover letters
netdev/patch_count success Link
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit fail Errors and warnings before: 0 this patch: 8
netdev/cc_maintainers warning 1 maintainers not CCed: colin.king@intel.com
netdev/build_clang fail Errors and warnings before: 0 this patch: 8
netdev/module_param success Was 0 now: 0
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn fail Errors and warnings before: 0 this patch: 8
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 16 lines checked
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
netdev/tree_selection success Guessing tree name failed - patch did not apply

Commit Message

Mark Brown Feb. 28, 2022, 5:39 p.m. UTC 
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(-)

Comments

Jakub Kicinski Feb. 28, 2022, 7:49 p.m. UTC | #1 
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!
patchwork-bot+netdevbpf@kernel.org Feb. 28, 2022, 7:50 p.m. UTC | #2 
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!
Stephen Rothwell Feb. 28, 2022, 9:26 p.m. UTC | #3 
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.
diff mbox series

Patch

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