- remove commented-out code

- add missing space to printk
- clean up code layout

Cc: Len Brown <lenb@kernel.org>
Cc: Matthew Garrett <mjg@redhat.com>
Cc: Shérab <Sebastien.Hinderer@ens-lyon.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/arch/x86/platform/iris/iris.c b/arch/x86/platform/iris/iris.c
index 65f29daa4bf546d72d776abda914acb7344b12b7..e22a01f692bed45de3d1f46562bd11454de88d65 100644 (file)
--- a/arch/x86/platform/iris/iris.c
+++ b/arch/x86/platform/iris/iris.c
@@ -65,14 +65,6 @@ static void iris_power_off(void)
  */
 static int iris_probe(struct platform_device *pdev)
 {
-/*
-       unsigned char status = inb(IRIS_GIO_INPUT);
-       if (status == IRIS_GIO_NODEV) {
-               printk(KERN_ERR "This machine does not seem to be an Iris. "
-                       "Power off handler not installed.\n");
-               return -ENODEV;
-       }
-*/
        old_pm_power_off = pm_power_off;
        pm_power_off = &iris_power_off;
        printk(KERN_INFO "Iris power_off handler installed.\n");
@@ -111,17 +103,17 @@ static int iris_init(void)
        int ret;
        if (force != 1) {
                printk(KERN_ERR "The force parameter has not been set to 1."
-                       "The Iris poweroff handler will not be installed.\n");
+                       " The Iris poweroff handler will not be installed.\n");
                return -ENODEV;
        }
        ret = platform_driver_register(&iris_driver);
        if (ret < 0) {
-               printk(KERN_ERR "Failed to register iris platform driver: "
-                       "%d\n", ret);
+               printk(KERN_ERR "Failed to register iris platform driver: %d\n",
+                       ret);
                return ret;
        }
-       iris_device = platform_device_register_simple(
-               "iris", (-1), iris_resources, ARRAY_SIZE(iris_resources));
+       iris_device = platform_device_register_simple("iris", (-1),
+                               iris_resources, ARRAY_SIZE(iris_resources));
        if (IS_ERR(iris_device)) {
                printk(KERN_ERR "Failed to register iris platform device\n");
                platform_driver_unregister(&iris_driver);