[PATCH] paride_register(): shuffle return values

paride_register() returns 1 on success, 0 on failure and module init
code looks like

	static int __init foo_init(void)
	{
		return paride_register(&foo) - 1;
	}

which is not what one get used to. Converted to usual 0/-E convention.

In case of kbic driver, unwind registration. It was just

	return (paride_register(&k951)||paride_register(&k971))-1;

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/block/paride/aten.c b/drivers/block/paride/aten.c
index 3539099a7fae5857db5d33438bdad76f52f9d703..2695465568ad9dde48b7563f0bfdc97404966a13 100644 (file)
--- a/drivers/block/paride/aten.c
+++ b/drivers/block/paride/aten.c
@@ -149,7 +149,7 @@ static struct pi_protocol aten = {
 
 static int __init aten_init(void)
 {
-       return paride_register(&aten)-1;
+       return paride_register(&aten);
 }
 
 static void __exit aten_exit(void)

diff --git a/drivers/block/paride/bpck.c b/drivers/block/paride/bpck.c
index b0df16dfd194043c3ef0095e2a92db9fb4f623f2..4f27e7392e38adc6663188805afed0e4e488b515 100644 (file)
--- a/drivers/block/paride/bpck.c
+++ b/drivers/block/paride/bpck.c
@@ -464,7 +464,7 @@ static struct pi_protocol bpck = {
 
 static int __init bpck_init(void)
 {
-       return paride_register(&bpck)-1;
+       return paride_register(&bpck);
 }
 
 static void __exit bpck_exit(void)

diff --git a/drivers/block/paride/bpck6.c b/drivers/block/paride/bpck6.c
index 7c04f74f9d751048779a5c90b8c7b00343d4fd25..da6b5d27badbe2ab28220ce4048eed0f80d32300 100644 (file)
--- a/drivers/block/paride/bpck6.c
+++ b/drivers/block/paride/bpck6.c
@@ -265,7 +265,7 @@ static int __init bpck6_init(void)
        printk(KERN_INFO "bpck6: Copyright 2001 by Micro Solutions, Inc., DeKalb IL. USA\n");
        if(verbose)
                printk(KERN_DEBUG "bpck6: verbose debug enabled.\n");
-       return paride_register(&bpck6) - 1;
+       return paride_register(&bpck6);
 }
 
 static void __exit bpck6_exit(void)

diff --git a/drivers/block/paride/comm.c b/drivers/block/paride/comm.c
index c3d4076e8c0ef31e4e99b2f20f4516bea01d80a2..9bcd354953234d5303adcdf37139ba07bbf8e1a3 100644 (file)
--- a/drivers/block/paride/comm.c
+++ b/drivers/block/paride/comm.c
@@ -205,7 +205,7 @@ static struct pi_protocol comm = {
 
 static int __init comm_init(void)
 {
-       return paride_register(&comm)-1;
+       return paride_register(&comm);
 }
 
 static void __exit comm_exit(void)

diff --git a/drivers/block/paride/dstr.c b/drivers/block/paride/dstr.c
index 2e4219eac5289171f36d2a1e97b7ddb86be3c0ad..accc5c777cbba7efa0aca7ea09ba0cfa08df0b48 100644 (file)
--- a/drivers/block/paride/dstr.c
+++ b/drivers/block/paride/dstr.c
@@ -220,7 +220,7 @@ static struct pi_protocol dstr = {
 
 static int __init dstr_init(void)
 {
-       return paride_register(&dstr)-1;
+       return paride_register(&dstr);
 }
 
 static void __exit dstr_exit(void)

diff --git a/drivers/block/paride/epat.c b/drivers/block/paride/epat.c
index 5ed4fc1a00bf4ecb9909a48bc11cf77d930d43a3..1bcdff77322effc30fc679596a01762f9d2672a0 100644 (file)
--- a/drivers/block/paride/epat.c
+++ b/drivers/block/paride/epat.c
@@ -327,7 +327,7 @@ static int __init epat_init(void)
 #ifdef CONFIG_PARIDE_EPATC8
        epatc8 = 1;
 #endif
-       return paride_register(&epat)-1;
+       return paride_register(&epat);
 }
 
 static void __exit epat_exit(void)

diff --git a/drivers/block/paride/epia.c b/drivers/block/paride/epia.c
index 649766c149026443e152425a17da63148ff0e93d..fb0e782d055e455dd1863d6be83ef90423eb0a4a 100644 (file)
--- a/drivers/block/paride/epia.c
+++ b/drivers/block/paride/epia.c
@@ -303,7 +303,7 @@ static struct pi_protocol epia = {
 
 static int __init epia_init(void)
 {
-       return paride_register(&epia)-1;
+       return paride_register(&epia);
 }
 
 static void __exit epia_exit(void)

diff --git a/drivers/block/paride/fit2.c b/drivers/block/paride/fit2.c
index 7a1624967038e7b33f71fbc017cd7a7fae29fd80..381283753ae4811ae514f716f00e46e236b2bf64 100644 (file)
--- a/drivers/block/paride/fit2.c
+++ b/drivers/block/paride/fit2.c
@@ -138,7 +138,7 @@ static struct pi_protocol fit2 = {
 
 static int __init fit2_init(void)
 {
-       return paride_register(&fit2)-1;
+       return paride_register(&fit2);
 }
 
 static void __exit fit2_exit(void)

diff --git a/drivers/block/paride/fit3.c b/drivers/block/paride/fit3.c
index c701577d15aad10545c1a57b136a5e0f2c118844..275d269458ebdfc6f87f19f6573992059e18828b 100644 (file)
--- a/drivers/block/paride/fit3.c
+++ b/drivers/block/paride/fit3.c
@@ -198,7 +198,7 @@ static struct pi_protocol fit3 = {
 
 static int __init fit3_init(void)
 {
-       return paride_register(&fit3)-1;
+       return paride_register(&fit3);
 }
 
 static void __exit fit3_exit(void)

diff --git a/drivers/block/paride/friq.c b/drivers/block/paride/friq.c
index e9edfa2e3a6c940a32b38ed8d57e4d7fca5e81ec..4f2ba244689b40583f03f476252b592493f751e9 100644 (file)
--- a/drivers/block/paride/friq.c
+++ b/drivers/block/paride/friq.c
@@ -263,7 +263,7 @@ static struct pi_protocol friq = {
 
 static int __init friq_init(void)
 {
-       return paride_register(&friq)-1;
+       return paride_register(&friq);
 }
 
 static void __exit friq_exit(void)

diff --git a/drivers/block/paride/frpw.c b/drivers/block/paride/frpw.c
index 407f821d24081b2a8e1e468d3dcf8bbe97171b27..c3cde364603a593d6270342e0b5dde661c99b948 100644 (file)
--- a/drivers/block/paride/frpw.c
+++ b/drivers/block/paride/frpw.c
@@ -300,7 +300,7 @@ static struct pi_protocol frpw = {
 
 static int __init frpw_init(void)
 {
-       return paride_register(&frpw)-1;
+       return paride_register(&frpw);
 }
 
 static void __exit frpw_exit(void)

diff --git a/drivers/block/paride/kbic.c b/drivers/block/paride/kbic.c
index a563281902765936c53613ce4613783761098fa4..35999c415ee339784df83acbd13abb4bb111ec48 100644 (file)
--- a/drivers/block/paride/kbic.c
+++ b/drivers/block/paride/kbic.c
@@ -283,7 +283,15 @@ static struct pi_protocol k971 = {
 
 static int __init kbic_init(void)
 {
-       return (paride_register(&k951)||paride_register(&k971))-1;
+       int rv;
+
+       rv = paride_register(&k951);
+       if (rv < 0)
+               return rv;
+       rv = paride_register(&k971);
+       if (rv < 0)
+               paride_unregister(&k951);
+       return rv;
 }
 
 static void __exit kbic_exit(void)

diff --git a/drivers/block/paride/ktti.c b/drivers/block/paride/ktti.c
index a9d85be020310ed432027f60b8fbe9eb0b19b56e..117ab0e8ccf0afc9156f500d795487fbfd1f4894 100644 (file)
--- a/drivers/block/paride/ktti.c
+++ b/drivers/block/paride/ktti.c
@@ -115,7 +115,7 @@ static struct pi_protocol ktti = {
 
 static int __init ktti_init(void)
 {
-       return paride_register(&ktti)-1;
+       return paride_register(&ktti);
 }
 
 static void __exit ktti_exit(void)

diff --git a/drivers/block/paride/on20.c b/drivers/block/paride/on20.c
index cc7e9f591dda5c76af935e3584b979d64a391719..0173697a1a4d5d9d474f14553e3d350ec0195b7e 100644 (file)
--- a/drivers/block/paride/on20.c
+++ b/drivers/block/paride/on20.c
@@ -140,7 +140,7 @@ static struct pi_protocol on20 = {
 
 static int __init on20_init(void)
 {
-       return paride_register(&on20)-1;
+       return paride_register(&on20);
 }
 
 static void __exit on20_exit(void)

diff --git a/drivers/block/paride/on26.c b/drivers/block/paride/on26.c
index 8755ce4869373ce3d5c32e092ed4cd23677c6005..95ba256921f20c128a4a676c4ad405bfc1cdc1aa 100644 (file)
--- a/drivers/block/paride/on26.c
+++ b/drivers/block/paride/on26.c
@@ -306,7 +306,7 @@ static struct pi_protocol on26 = {
 
 static int __init on26_init(void)
 {
-       return paride_register(&on26)-1;
+       return paride_register(&on26);
 }
 
 static void __exit on26_exit(void)

diff --git a/drivers/block/paride/paride.c b/drivers/block/paride/paride.c
index 55cabfb60cc5ca5cda8c973983c6b9d74a346b0c..e4c55e0501268d46648da94ca3ad8756fe3894ca 100644 (file)
--- a/drivers/block/paride/paride.c
+++ b/drivers/block/paride/paride.c
@@ -237,19 +237,19 @@ int paride_register(PIP * pr)
                if (protocols[k] && !strcmp(pr->name, protocols[k]->name)) {
                        printk("paride: %s protocol already registered\n",
                               pr->name);
-                       return 0;
+                       return -1;
                }
        k = 0;
        while ((k < MAX_PROTOS) && (protocols[k]))
                k++;
        if (k == MAX_PROTOS) {
                printk("paride: protocol table full\n");
-               return 0;
+               return -1;
        }
        protocols[k] = pr;
        pr->index = k;
        printk("paride: %s registered as protocol %d\n", pr->name, k);
-       return 1;
+       return 0;
 }
 
 EXPORT_SYMBOL(paride_register);