lkml.org 
[lkml]   [2007]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 38/60] create /sys/.../power when CONFIG_PM is set

    2.6.23-stable review patch. If anyone has any objections, please let us
    know.

    ------------------
    From: Daniel Drake <dsd@gentoo.org>

    patch dec13c15445fec29ca9087890895718450e80b95 in mainline.

    The CONFIG_SUSPEND changes in 2.6.23 caused a regression under certain
    configuration conditions (SUSPEND=n, USB_AUTOSUSPEND=y) where all USB
    device attributes in sysfs (idVendor, idProduct, ...) silently disappeared,
    causing udev breakage and more.

    The cause of this is that the /sys/.../power subdirectory is now only
    created when CONFIG_PM_SLEEP is set, however, it should be created whenever
    CONFIG_PM is set to handle the above situation. The following patch fixes
    the regression.

    Signed-off-by: Daniel Drake <dsd@gentoo.org>
    Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
    Cc: Alan Stern <stern@rowland.harvard.edu>
    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/base/core.c | 4 +++-
    drivers/base/power/Makefile | 3 ++-
    drivers/base/power/main.c | 8 +-------
    drivers/base/power/power.h | 25 ++++++++++++++++++-------
    4 files changed, 24 insertions(+), 16 deletions(-)

    --- a/drivers/base/core.c
    +++ b/drivers/base/core.c
    @@ -814,9 +814,10 @@ int device_add(struct device *dev)
    error = device_add_attrs(dev);
    if (error)
    goto AttrsError;
    - error = device_pm_add(dev);
    + error = dpm_sysfs_add(dev);
    if (error)
    goto PMError;
    + device_pm_add(dev);
    error = bus_add_device(dev);
    if (error)
    goto BusError;
    @@ -841,6 +842,7 @@ int device_add(struct device *dev)
    return error;
    BusError:
    device_pm_remove(dev);
    + dpm_sysfs_remove(dev);
    PMError:
    if (dev->bus)
    blocking_notifier_call_chain(&dev->bus->bus_notifier,
    --- a/drivers/base/power/Makefile
    +++ b/drivers/base/power/Makefile
    @@ -1,5 +1,6 @@
    obj-y := shutdown.o
    -obj-$(CONFIG_PM_SLEEP) += main.o suspend.o resume.o sysfs.o
    +obj-$(CONFIG_PM) += sysfs.o
    +obj-$(CONFIG_PM_SLEEP) += main.o suspend.o resume.o
    obj-$(CONFIG_PM_TRACE) += trace.o

    ifeq ($(CONFIG_DEBUG_DRIVER),y)
    --- a/drivers/base/power/main.c
    +++ b/drivers/base/power/main.c
    @@ -33,20 +33,14 @@ DEFINE_MUTEX(dpm_list_mtx);

    int (*platform_enable_wakeup)(struct device *dev, int is_on);

    -int device_pm_add(struct device *dev)
    +void device_pm_add(struct device *dev)
    {
    - int error;
    -
    pr_debug("PM: Adding info for %s:%s\n",
    dev->bus ? dev->bus->name : "No Bus",
    kobject_name(&dev->kobj));
    mutex_lock(&dpm_list_mtx);
    list_add_tail(&dev->power.entry, &dpm_active);
    - error = dpm_sysfs_add(dev);
    - if (error)
    - list_del(&dev->power.entry);
    mutex_unlock(&dpm_list_mtx);
    - return error;
    }

    void device_pm_remove(struct device *dev)
    --- a/drivers/base/power/power.h
    +++ b/drivers/base/power/power.h
    @@ -34,14 +34,26 @@ static inline struct dev_pm_info * to_pm
    return container_of(entry, struct dev_pm_info, entry);
    }

    -static inline struct device * to_device(struct list_head * entry)
    +static inline struct device *to_device(struct list_head *entry)
    {
    return container_of(to_pm_info(entry), struct device, power);
    }

    -extern int device_pm_add(struct device *);
    +extern void device_pm_add(struct device *);
    extern void device_pm_remove(struct device *);

    +#else /* CONFIG_PM_SLEEP */
    +
    +static inline void device_pm_add(struct device *dev)
    +{
    +}
    +
    +static inline void device_pm_remove(struct device *dev)
    +{
    +}
    +#endif
    +
    +#ifdef CONFIG_PM
    /*
    * sysfs.c
    */
    @@ -62,16 +74,15 @@ extern int resume_device(struct device *
    */
    extern int suspend_device(struct device *, pm_message_t);

    -#else /* CONFIG_PM_SLEEP */
    -
    +#else /* CONFIG_PM */

    -static inline int device_pm_add(struct device * dev)
    +static inline int dpm_sysfs_add(struct device *dev)
    {
    return 0;
    }
    -static inline void device_pm_remove(struct device * dev)
    -{

    +static inline void dpm_sysfs_remove(struct device *dev)
    +{
    }

    #endif
    --


    \
     
     \ /
      Last update: 2007-12-13 08:15    [W:0.026 / U:34.400 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site