From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: - leds-add-possibility-to-remove-leds-classdevs-during-suspend-resume.patch removed from -mm tree Date: Tue, 05 Feb 2008 14:34:21 -0800 Message-ID: <200802052234.m15MY2dY012481@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp2.linux-foundation.org ([207.189.120.14]:59339 "EHLO smtp2.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762842AbYBEWpT (ORCPT ); Tue, 5 Feb 2008 17:45:19 -0500 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: rjw@sisk.pl, greg@kroah.com, kay.sievers@vrfy.org, lenb@kernel.org, linville@tuxdriver.com, mb@bu3sch.de, pavel@ucw.cz, rpurdie@rpsys.net, stern@rowland.harvard.edu, mm-commits@vger.kernel.org The patch titled leds: add possibility to remove leds classdevs during suspend/resume has been removed from the -mm tree. Its filename was leds-add-possibility-to-remove-leds-classdevs-during-suspend-resume.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: leds: add possibility to remove leds classdevs during suspend/resume From: Rafael J. Wysocki Make it possible to unregister a led classdev object in a safe way during a suspend/resume cycle. Signed-off-by: Rafael J. Wysocki Cc: Michael Buesch Cc: Pavel Machek Cc: "John W. Linville" Cc: Alan Stern Cc: Len Brown Cc: Greg KH Cc: Kay Sievers Cc: Richard Purdie Signed-off-by: Andrew Morton --- drivers/leds/led-class.c | 13 +++++++++---- include/linux/leds.h | 10 +++++++++- 2 files changed, 18 insertions(+), 5 deletions(-) diff -puN drivers/leds/led-class.c~leds-add-possibility-to-remove-leds-classdevs-during-suspend-resume drivers/leds/led-class.c --- a/drivers/leds/led-class.c~leds-add-possibility-to-remove-leds-classdevs-during-suspend-resume +++ a/drivers/leds/led-class.c @@ -137,12 +137,14 @@ err_out: EXPORT_SYMBOL_GPL(led_classdev_register); /** - * led_classdev_unregister - unregisters a object of led_properties class. + * __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) +void __led_classdev_unregister(struct led_classdev *led_cdev, + bool suspended) { device_remove_file(led_cdev->dev, &dev_attr_brightness); #ifdef CONFIG_LEDS_TRIGGERS @@ -153,13 +155,16 @@ void led_classdev_unregister(struct led_ up_write(&led_cdev->trigger_lock); #endif - device_unregister(led_cdev->dev); + if (suspended) + device_pm_schedule_removal(led_cdev->dev); + else + 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 -puN include/linux/leds.h~leds-add-possibility-to-remove-leds-classdevs-during-suspend-resume include/linux/leds.h --- a/include/linux/leds.h~leds-add-possibility-to-remove-leds-classdevs-during-suspend-resume +++ a/include/linux/leds.h @@ -54,7 +54,15 @@ struct led_classdev { extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev); -extern void led_classdev_unregister(struct led_classdev *led_cdev); +extern void __led_classdev_unregister(struct led_classdev *led_cdev, bool sus); +static inline void led_classdev_unregister(struct led_classdev *lcd) +{ + __led_classdev_unregister(lcd, false); +} +static inline void led_classdev_unregister_suspended(struct led_classdev *lcd) +{ + __led_classdev_unregister(lcd, true); +} extern void led_classdev_suspend(struct led_classdev *led_cdev); extern void led_classdev_resume(struct led_classdev *led_cdev); _ Patches currently in -mm which might be from rjw@sisk.pl are origin.patch git-acpi.patch git-x86.patch git-xfs.patch proc-fix-the-threaded-proc-self.patch shrink_slab-handle-bad-shrinkers.patch