diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2013-07-14 21:50:32 -0400 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2013-07-14 21:55:01 -0400 |
commit | 8c6ffba0eddc8c110dbf444f51354ce42069abfc (patch) | |
tree | 1055a1cfdf7bd79d6e2c4b969d412780ff2d2209 /drivers/net/ethernet | |
parent | 6e8b8726ad503214ba66e34aed69aff41de33489 (diff) |
PTR_RET is now PTR_ERR_OR_ZERO(): Replace most.
Sweep of the simple cases.
Cc: netdev@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: David S. Miller <davem@davemloft.net>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r-- | drivers/net/ethernet/amd/atarilance.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/amd/mvme147.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/amd/ni65.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/amd/sun3lance.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/amd/atarilance.c b/drivers/net/ethernet/amd/atarilance.c index e8d0ef508f48..10ceca523fc0 100644 --- a/drivers/net/ethernet/amd/atarilance.c +++ b/drivers/net/ethernet/amd/atarilance.c | |||
@@ -1147,7 +1147,7 @@ static struct net_device *atarilance_dev; | |||
1147 | static int __init atarilance_module_init(void) | 1147 | static int __init atarilance_module_init(void) |
1148 | { | 1148 | { |
1149 | atarilance_dev = atarilance_probe(-1); | 1149 | atarilance_dev = atarilance_probe(-1); |
1150 | return PTR_RET(atarilance_dev); | 1150 | return PTR_ERR_OR_ZERO(atarilance_dev); |
1151 | } | 1151 | } |
1152 | 1152 | ||
1153 | static void __exit atarilance_module_exit(void) | 1153 | static void __exit atarilance_module_exit(void) |
diff --git a/drivers/net/ethernet/amd/mvme147.c b/drivers/net/ethernet/amd/mvme147.c index a51497c9d2af..e108e911da05 100644 --- a/drivers/net/ethernet/amd/mvme147.c +++ b/drivers/net/ethernet/amd/mvme147.c | |||
@@ -188,7 +188,7 @@ static struct net_device *dev_mvme147_lance; | |||
188 | int __init init_module(void) | 188 | int __init init_module(void) |
189 | { | 189 | { |
190 | dev_mvme147_lance = mvme147lance_probe(-1); | 190 | dev_mvme147_lance = mvme147lance_probe(-1); |
191 | return PTR_RET(dev_mvme147_lance); | 191 | return PTR_ERR_OR_ZERO(dev_mvme147_lance); |
192 | } | 192 | } |
193 | 193 | ||
194 | void __exit cleanup_module(void) | 194 | void __exit cleanup_module(void) |
diff --git a/drivers/net/ethernet/amd/ni65.c b/drivers/net/ethernet/amd/ni65.c index 26fc0ce0faa3..1cf33addd15e 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)"); | |||
1238 | int __init init_module(void) | 1238 | int __init init_module(void) |
1239 | { | 1239 | { |
1240 | dev_ni65 = ni65_probe(-1); | 1240 | dev_ni65 = ni65_probe(-1); |
1241 | return PTR_RET(dev_ni65); | 1241 | return PTR_ERR_OR_ZERO(dev_ni65); |
1242 | } | 1242 | } |
1243 | 1243 | ||
1244 | void __exit cleanup_module(void) | 1244 | void __exit cleanup_module(void) |
diff --git a/drivers/net/ethernet/amd/sun3lance.c b/drivers/net/ethernet/amd/sun3lance.c index 4375abe61da1..d6b20296b8e4 100644 --- a/drivers/net/ethernet/amd/sun3lance.c +++ b/drivers/net/ethernet/amd/sun3lance.c | |||
@@ -940,7 +940,7 @@ static struct net_device *sun3lance_dev; | |||
940 | int __init init_module(void) | 940 | int __init init_module(void) |
941 | { | 941 | { |
942 | sun3lance_dev = sun3lance_probe(-1); | 942 | sun3lance_dev = sun3lance_probe(-1); |
943 | return PTR_RET(sun3lance_dev); | 943 | return PTR_ERR_OR_ZERO(sun3lance_dev); |
944 | } | 944 | } |
945 | 945 | ||
946 | void __exit cleanup_module(void) | 946 | void __exit cleanup_module(void) |