aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSilviu-Mihai Popescu <silviupopescu1990@gmail.com>2013-03-11 17:48:07 -0400
committerDavid S. Miller <davem@davemloft.net>2013-03-12 06:57:22 -0400
commit3ffd880d3c6c63cdf575764da9e903fc3249937d (patch)
tree7b29b2653922f92ee70414a33c2f8d33879cfb51
parentb6bb4dfcb1803765e7d12a9807a8d4650545199a (diff)
ethernet: amd: use PTR_RET instead of IS_ERR + PTR_ERR
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>
-rw-r--r--drivers/net/ethernet/amd/atarilance.c4
-rw-r--r--drivers/net/ethernet/amd/mvme147.c4
-rw-r--r--drivers/net/ethernet/amd/ni65.c2
-rw-r--r--drivers/net/ethernet/amd/sun3lance.c4
4 files changed, 4 insertions, 10 deletions
diff --git a/drivers/net/ethernet/amd/atarilance.c b/drivers/net/ethernet/amd/atarilance.c
index ab9bedb8d276..e8d0ef508f48 100644
--- a/drivers/net/ethernet/amd/atarilance.c
+++ b/drivers/net/ethernet/amd/atarilance.c
@@ -1147,9 +1147,7 @@ static struct net_device *atarilance_dev;
1147static int __init atarilance_module_init(void) 1147static int __init atarilance_module_init(void)
1148{ 1148{
1149 atarilance_dev = atarilance_probe(-1); 1149 atarilance_dev = atarilance_probe(-1);
1150 if (IS_ERR(atarilance_dev)) 1150 return PTR_RET(atarilance_dev);
1151 return PTR_ERR(atarilance_dev);
1152 return 0;
1153} 1151}
1154 1152
1155static void __exit atarilance_module_exit(void) 1153static void __exit atarilance_module_exit(void)
diff --git a/drivers/net/ethernet/amd/mvme147.c b/drivers/net/ethernet/amd/mvme147.c
index 9af3c307862c..a51497c9d2af 100644
--- a/drivers/net/ethernet/amd/mvme147.c
+++ b/drivers/net/ethernet/amd/mvme147.c
@@ -188,9 +188,7 @@ static struct net_device *dev_mvme147_lance;
188int __init init_module(void) 188int __init init_module(void)
189{ 189{
190 dev_mvme147_lance = mvme147lance_probe(-1); 190 dev_mvme147_lance = mvme147lance_probe(-1);
191 if (IS_ERR(dev_mvme147_lance)) 191 return PTR_RET(dev_mvme147_lance);
192 return PTR_ERR(dev_mvme147_lance);
193 return 0;
194} 192}
195 193
196void __exit cleanup_module(void) 194void __exit cleanup_module(void)
diff --git a/drivers/net/ethernet/amd/ni65.c b/drivers/net/ethernet/amd/ni65.c
index 013b65108536..26fc0ce0faa3 100644
--- a/drivers/net/ethernet/amd/ni65.c
+++ b/drivers/net/ethernet/amd/ni65.c
@@ -1238,7 +1238,7 @@ MODULE_PARM_DESC(dma, "ni6510 ISA DMA channel (ignored for some cards)");
1238int __init init_module(void) 1238int __init init_module(void)
1239{ 1239{
1240 dev_ni65 = ni65_probe(-1); 1240 dev_ni65 = ni65_probe(-1);
1241 return IS_ERR(dev_ni65) ? PTR_ERR(dev_ni65) : 0; 1241 return PTR_RET(dev_ni65);
1242} 1242}
1243 1243
1244void __exit cleanup_module(void) 1244void __exit cleanup_module(void)
diff --git a/drivers/net/ethernet/amd/sun3lance.c b/drivers/net/ethernet/amd/sun3lance.c
index de412d331a72..4375abe61da1 100644
--- a/drivers/net/ethernet/amd/sun3lance.c
+++ b/drivers/net/ethernet/amd/sun3lance.c
@@ -940,9 +940,7 @@ static struct net_device *sun3lance_dev;
940int __init init_module(void) 940int __init init_module(void)
941{ 941{
942 sun3lance_dev = sun3lance_probe(-1); 942 sun3lance_dev = sun3lance_probe(-1);
943 if (IS_ERR(sun3lance_dev)) 943 return PTR_RET(sun3lance_dev);
944 return PTR_ERR(sun3lance_dev);
945 return 0;
946} 944}
947 945
948void __exit cleanup_module(void) 946void __exit cleanup_module(void)