From: Andrew Morton Date: Tue, 26 Jul 2011 10:14:38 +0000 (+1000) Subject: - remove commented-out code X-Git-Tag: next-20110729~6^2~66 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fcad58d7b4175218d01edcc659758a3ad6f32e29;p=karo-tx-linux.git - remove commented-out code - add missing space to printk - clean up code layout Cc: Len Brown Cc: Matthew Garrett Cc: Shérab Signed-off-by: Andrew Morton --- diff --git a/arch/x86/platform/iris/iris.c b/arch/x86/platform/iris/iris.c index 65f29daa4bf5..e22a01f692be 100644 --- 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);