From 74311d428f00f27ee660ba680129447f403e7bbc Mon Sep 17 00:00:00 2001 From: Silviu-Mihai Popescu Date: Mon, 11 Mar 2013 21:48:07 +0000 Subject: [PATCH] --- yaml --- r: 368211 b: refs/heads/master c: 3ffd880d3c6c63cdf575764da9e903fc3249937d h: refs/heads/master i: 368209: 1c42a682160500125f1945020f6bc8a195f8dee4 368207: 49775418312d839b3350464efa696c80cb5fc90a v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/amd/atarilance.c | 4 +--- trunk/drivers/net/ethernet/amd/mvme147.c | 4 +--- trunk/drivers/net/ethernet/amd/ni65.c | 2 +- trunk/drivers/net/ethernet/amd/sun3lance.c | 4 +--- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 8817296bfae5..f761182dd04e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b6bb4dfcb1803765e7d12a9807a8d4650545199a +refs/heads/master: 3ffd880d3c6c63cdf575764da9e903fc3249937d diff --git a/trunk/drivers/net/ethernet/amd/atarilance.c b/trunk/drivers/net/ethernet/amd/atarilance.c index ab9bedb8d276..e8d0ef508f48 100644 --- a/trunk/drivers/net/ethernet/amd/atarilance.c +++ b/trunk/drivers/net/ethernet/amd/atarilance.c @@ -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) diff --git a/trunk/drivers/net/ethernet/amd/mvme147.c b/trunk/drivers/net/ethernet/amd/mvme147.c index 9af3c307862c..a51497c9d2af 100644 --- a/trunk/drivers/net/ethernet/amd/mvme147.c +++ b/trunk/drivers/net/ethernet/amd/mvme147.c @@ -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) diff --git a/trunk/drivers/net/ethernet/amd/ni65.c b/trunk/drivers/net/ethernet/amd/ni65.c index 013b65108536..26fc0ce0faa3 100644 --- a/trunk/drivers/net/ethernet/amd/ni65.c +++ b/trunk/drivers/net/ethernet/amd/ni65.c @@ -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) diff --git a/trunk/drivers/net/ethernet/amd/sun3lance.c b/trunk/drivers/net/ethernet/amd/sun3lance.c index de412d331a72..4375abe61da1 100644 --- a/trunk/drivers/net/ethernet/amd/sun3lance.c +++ b/trunk/drivers/net/ethernet/amd/sun3lance.c @@ -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)