[PATCH] Fix some compile warnings

From: "Martin J. Bligh" <mbligh@aracnet.com>

Fix a couple of instances of "warning: suggest parentheses around assignment
used as truth value".

diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index 5d35a324e0191dab4c6a2e693085a5533f10d9e3..a5d65dc4eff79b4dd5dc66b5a4425698c96097e0 100644 (file)
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -49,8 +49,12 @@ int __init register_cpu(struct cpu *cpu, int num, struct node *root)
 int __init cpu_dev_init(void)
 {
        int error;
-       if (!(error = devclass_register(&cpu_devclass)))
-               if ((error = driver_register(&cpu_driver)))
+
+       error = devclass_register(&cpu_devclass);
+       if (!error) {
+               error = driver_register(&cpu_driver);
+               if (error)
                        devclass_unregister(&cpu_devclass);
+       }
        return error;
 }

diff --git a/drivers/base/memblk.c b/drivers/base/memblk.c
index 350078bd30b0fcb0152f7c512d0fc96af3da8ec1..676c6f26ffcda35330f830e95a583fa13cd99c64 100644 (file)
--- a/drivers/base/memblk.c
+++ b/drivers/base/memblk.c
@@ -50,9 +50,13 @@ int __init register_memblk(struct memblk *memblk, int num, struct node *root)
 int __init register_memblk_type(void)
 {
        int error;
-       if (!(error = devclass_register(&memblk_devclass)))
-               if (error = driver_register(&memblk_driver))
+
+       error = devclass_register(&memblk_devclass);
+       if (!error) {
+               error = driver_register(&memblk_driver);
+               if (error)
                        devclass_unregister(&memblk_devclass);
+       }
        return error;
 }
 postcore_initcall(register_memblk_type);

diff --git a/drivers/base/node.c b/drivers/base/node.c
index cfcf117018dc0f74bca613633926059a51e3995b..e08b7c5f208e9228cc0366edc910092b97b8b5af 100644 (file)
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -92,9 +92,13 @@ int __init register_node(struct node *node, int num, struct node *parent)
 int __init register_node_type(void)
 {
        int error;
-       if (!(error = devclass_register(&node_devclass)))
-               if (error = driver_register(&node_driver))
+       
+       error = devclass_register(&node_devclass);
+       if (!error) {
+               error = driver_register(&node_driver);
+               if (error)
                        devclass_unregister(&node_devclass);
+       }
        return error;
 }
 postcore_initcall(register_node_type);