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/appletalk | |
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/appletalk')
-rw-r--r-- | drivers/net/appletalk/cops.c | 2 | ||||
-rw-r--r-- | drivers/net/appletalk/ltpc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c index cff6f023c03a..7f2a032c354c 100644 --- a/drivers/net/appletalk/cops.c +++ b/drivers/net/appletalk/cops.c | |||
@@ -996,7 +996,7 @@ static int __init cops_module_init(void) | |||
996 | printk(KERN_WARNING "%s: You shouldn't autoprobe with insmod\n", | 996 | printk(KERN_WARNING "%s: You shouldn't autoprobe with insmod\n", |
997 | cardname); | 997 | cardname); |
998 | cops_dev = cops_probe(-1); | 998 | cops_dev = cops_probe(-1); |
999 | return PTR_RET(cops_dev); | 999 | return PTR_ERR_OR_ZERO(cops_dev); |
1000 | } | 1000 | } |
1001 | 1001 | ||
1002 | static void __exit cops_module_exit(void) | 1002 | static void __exit cops_module_exit(void) |
diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c index b5782cdf0bca..01e2ac55c137 100644 --- a/drivers/net/appletalk/ltpc.c +++ b/drivers/net/appletalk/ltpc.c | |||
@@ -1243,7 +1243,7 @@ static int __init ltpc_module_init(void) | |||
1243 | "ltpc: Autoprobing is not recommended for modules\n"); | 1243 | "ltpc: Autoprobing is not recommended for modules\n"); |
1244 | 1244 | ||
1245 | dev_ltpc = ltpc_probe(); | 1245 | dev_ltpc = ltpc_probe(); |
1246 | return PTR_RET(dev_ltpc); | 1246 | return PTR_ERR_OR_ZERO(dev_ltpc); |
1247 | } | 1247 | } |
1248 | module_init(ltpc_module_init); | 1248 | module_init(ltpc_module_init); |
1249 | #endif | 1249 | #endif |