Skip to content

Commit

Permalink
ethernet: amd: use PTR_RET instead of IS_ERR + PTR_ERR
Browse files Browse the repository at this point in the history
This uses PTR_RET instead of IS_ERR and PTR_ERR in order to increase
readability.

Signed-off-by: Silviu-Mihai Popescu <silviupopescu1990@gmail.com>
Acked-by: <Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Silviu-Mihai Popescu authored and David S. Miller committed Mar 12, 2013
1 parent b6bb4df commit 3ffd880
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 10 deletions.
4 changes: 1 addition & 3 deletions drivers/net/ethernet/amd/atarilance.c
Original file line number Diff line number Diff line change
Expand Up @@ -1147,9 +1147,7 @@ static struct net_device *atarilance_dev;
static int __init atarilance_module_init(void)
{
atarilance_dev = atarilance_probe(-1);
if (IS_ERR(atarilance_dev))
return PTR_ERR(atarilance_dev);
return 0;
return PTR_RET(atarilance_dev);
}

static void __exit atarilance_module_exit(void)
Expand Down
4 changes: 1 addition & 3 deletions drivers/net/ethernet/amd/mvme147.c
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,7 @@ static struct net_device *dev_mvme147_lance;
int __init init_module(void)
{
dev_mvme147_lance = mvme147lance_probe(-1);
if (IS_ERR(dev_mvme147_lance))
return PTR_ERR(dev_mvme147_lance);
return 0;
return PTR_RET(dev_mvme147_lance);
}

void __exit cleanup_module(void)
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/amd/ni65.c
Original file line number Diff line number Diff line change
Expand Up @@ -1238,7 +1238,7 @@ MODULE_PARM_DESC(dma, "ni6510 ISA DMA channel (ignored for some cards)");
int __init init_module(void)
{
dev_ni65 = ni65_probe(-1);
return IS_ERR(dev_ni65) ? PTR_ERR(dev_ni65) : 0;
return PTR_RET(dev_ni65);
}

void __exit cleanup_module(void)
Expand Down
4 changes: 1 addition & 3 deletions drivers/net/ethernet/amd/sun3lance.c
Original file line number Diff line number Diff line change
Expand Up @@ -940,9 +940,7 @@ static struct net_device *sun3lance_dev;
int __init init_module(void)
{
sun3lance_dev = sun3lance_probe(-1);
if (IS_ERR(sun3lance_dev))
return PTR_ERR(sun3lance_dev);
return 0;
return PTR_RET(sun3lance_dev);
}

void __exit cleanup_module(void)
Expand Down

0 comments on commit 3ffd880

Please sign in to comment.