4 files changed, 3 insertions, 148 deletions

diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 91d36d07e6ae..eb97c4113d78 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -45,13 +45,6 @@ config LEDS_SPITZ
           This option enables support for the LEDs on Sharp Zaurus
           SL-Cxx00 series (C1000, C3000, C3100).
 
-config LEDS_TOSA
-        tristate "LED Support for the Sharp SL-6000 series"
-        depends on LEDS_CLASS && PXA_SHARPSL
-        help
-          This option enables support for the LEDs on Sharp Zaurus
-          SL-6000 series.
-
 config LEDS_S3C24XX
         tristate "LED Support for Samsung S3C24XX GPIO LEDs"
         depends on LEDS_CLASS && ARCH_S3C2410
diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
index 84ced3b1a13d..e54f42da21a2 100644
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -9,7 +9,6 @@ obj-$(CONFIG_LEDS_ATMEL_PWM)		+= leds-atmel-pwm.o
 obj-$(CONFIG_LEDS_CORGI)                += leds-corgi.o
 obj-$(CONFIG_LEDS_LOCOMO)               += leds-locomo.o
 obj-$(CONFIG_LEDS_SPITZ)                += leds-spitz.o
-obj-$(CONFIG_LEDS_TOSA)                 += leds-tosa.o
 obj-$(CONFIG_LEDS_S3C24XX)              += leds-s3c24xx.o
 obj-$(CONFIG_LEDS_AMS_DELTA)            += leds-ams-delta.o
 obj-$(CONFIG_LEDS_NET48XX)              += leds-net48xx.o
diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index 4a938780dfc3..63aad90247c4 100644
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -139,12 +139,10 @@ EXPORT_SYMBOL_GPL(led_classdev_register);
 /**
  * __led_classdev_unregister - unregisters a object of led_properties class.
  * @led_cdev: the led device to unregister
- * @suspended: indicates whether system-wide suspend or resume is in progress
  *
  * Unregisters a previously registered via led_classdev_register object.
  */
-void __led_classdev_unregister(struct led_classdev *led_cdev,
-                                      bool suspended)
+void led_classdev_unregister(struct led_classdev *led_cdev)
 {
         device_remove_file(led_cdev->dev, &dev_attr_brightness);
 #ifdef CONFIG_LEDS_TRIGGERS
@@ -155,16 +153,13 @@ void __led_classdev_unregister(struct led_classdev *led_cdev,
         up_write(&led_cdev->trigger_lock);
 #endif
 
-        if (suspended)
-                device_pm_schedule_removal(led_cdev->dev);
-        else
-                device_unregister(led_cdev->dev);
+        device_unregister(led_cdev->dev);
 
         down_write(&leds_list_lock);
         list_del(&led_cdev->node);
         up_write(&leds_list_lock);
 }
-EXPORT_SYMBOL_GPL(__led_classdev_unregister);
+EXPORT_SYMBOL_GPL(led_classdev_unregister);
 
 static int __init leds_init(void)
 {
diff --git a/drivers/leds/leds-tosa.c b/drivers/leds/leds-tosa.c
deleted file mode 100644
index 7ebecc41a9be..000000000000
--- a/drivers/leds/leds-tosa.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * LED Triggers Core
- *
- * Copyright 2005 Dirk Opfer
- *
- * Author: Dirk Opfer <Dirk@Opfer-Online.de>
- *      based on spitz.c
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/leds.h>
-#include <asm/hardware/scoop.h>
-#include <asm/mach-types.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/tosa.h>
-
-static void tosaled_amber_set(struct led_classdev *led_cdev,
-                                enum led_brightness value)
-{
-        if (value)
-                set_scoop_gpio(&tosascoop_jc_device.dev,
-                                TOSA_SCOOP_JC_CHRG_ERR_LED);
-        else
-                reset_scoop_gpio(&tosascoop_jc_device.dev,
-                                TOSA_SCOOP_JC_CHRG_ERR_LED);
-}
-
-static void tosaled_green_set(struct led_classdev *led_cdev,
-                                enum led_brightness value)
-{
-        if (value)
-                set_scoop_gpio(&tosascoop_jc_device.dev,
-                                TOSA_SCOOP_JC_NOTE_LED);
-        else
-                reset_scoop_gpio(&tosascoop_jc_device.dev,
-                                TOSA_SCOOP_JC_NOTE_LED);
-}
-
-static struct led_classdev tosa_amber_led = {
-        .name                   = "tosa:amber:charge",
-        .default_trigger        = "sharpsl-charge",
-        .brightness_set         = tosaled_amber_set,
-};
-
-static struct led_classdev tosa_green_led = {
-        .name                   = "tosa:green:mail",
-        .default_trigger        = "nand-disk",
-        .brightness_set         = tosaled_green_set,
-};
-
-#ifdef CONFIG_PM
-static int tosaled_suspend(struct platform_device *dev, pm_message_t state)
-{
-#ifdef CONFIG_LEDS_TRIGGERS
-        if (tosa_amber_led.trigger && strcmp(tosa_amber_led.trigger->name,
-                                                "sharpsl-charge"))
-#endif
-                led_classdev_suspend(&tosa_amber_led);
-        led_classdev_suspend(&tosa_green_led);
-        return 0;
-}
-
-static int tosaled_resume(struct platform_device *dev)
-{
-        led_classdev_resume(&tosa_amber_led);
-        led_classdev_resume(&tosa_green_led);
-        return 0;
-}
-#else
-#define tosaled_suspend NULL
-#define tosaled_resume NULL
-#endif
-
-static int tosaled_probe(struct platform_device *pdev)
-{
-        int ret;
-
-        ret = led_classdev_register(&pdev->dev, &tosa_amber_led);
-        if (ret < 0)
-                return ret;
-
-        ret = led_classdev_register(&pdev->dev, &tosa_green_led);
-        if (ret < 0)
-                led_classdev_unregister(&tosa_amber_led);
-
-        return ret;
-}
-
-static int tosaled_remove(struct platform_device *pdev)
-{
-        led_classdev_unregister(&tosa_amber_led);
-        led_classdev_unregister(&tosa_green_led);
-
-        return 0;
-}
-
-static struct platform_driver tosaled_driver = {
-        .probe          = tosaled_probe,
-        .remove         = tosaled_remove,
-        .suspend        = tosaled_suspend,
-        .resume         = tosaled_resume,
-        .driver         = {
-                .name           = "tosa-led",
-                .owner          = THIS_MODULE,
-        },
-};
-
-static int __init tosaled_init(void)
-{
-        return platform_driver_register(&tosaled_driver);
-}
-
-static void __exit tosaled_exit(void)
-{
-        platform_driver_unregister(&tosaled_driver);
-}
-
-module_init(tosaled_init);
-module_exit(tosaled_exit);
-
-MODULE_AUTHOR("Dirk Opfer <Dirk@Opfer-Online.de>");
-MODULE_DESCRIPTION("Tosa LED driver");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:tosa-led");