Commit 9a7834d0 authored by Andrew Morton's avatar Andrew Morton Committed by Greg Kroah-Hartman
Browse files

[PATCH] USB: fix pm patches with CONFIG_PM off part 2 



With CONFIG_PM=n:

drivers/built-in.o(.text+0x1098c): In function `hub_thread':
drivers/usb/core/hub.c:2673: undefined reference to `.dpm_runtime_resume'
drivers/built-in.o(.text+0x10998):drivers/usb/core/hub.c:2674: undefined reference to `.dpm_runtime_resume'

Please, never ever ever put extern decls into .c files.  Use the darn header
files :(

Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent db2d55b7

drivers/base/power/power.h

+0 −13
Original line number Diff line number Diff line
@@ -67,9 +67,6 @@ extern int suspend_device(struct device *, pm_message_t); 
 * runtime.c

 */



extern int dpm_runtime_suspend(struct device *, pm_message_t);

extern void dpm_runtime_resume(struct device *);



#else /* CONFIG_PM */
@@ -82,14 +79,4 @@ static inline void device_pm_remove(struct device * dev) 


}



static inline int dpm_runtime_suspend(struct device * dev, pm_message_t state)

{

	return 0;

}



static inline void dpm_runtime_resume(struct device * dev)

{



}



#endif

drivers/usb/core/hub.c

+0 −2
Original line number Diff line number Diff line
@@ -2652,8 +2652,6 @@ static void hub_events(void) 
		 * stub "device" node was never suspended.

		 */

		if (i) {

			extern void dpm_runtime_resume(struct device *);



			dpm_runtime_resume(&hdev->dev);

			dpm_runtime_resume(&intf->dev);

		}

include/linux/pm.h

+13 −0
Original line number Diff line number Diff line
@@ -243,6 +243,9 @@ extern int device_suspend(pm_message_t state); 
#define device_may_wakeup(dev) \

	(device_can_wakeup(dev) && (dev)->power.should_wakeup)



extern int dpm_runtime_suspend(struct device *, pm_message_t);

extern void dpm_runtime_resume(struct device *);



#else /* !CONFIG_PM */



static inline int device_suspend(pm_message_t state)
@@ -253,6 +256,16 @@ static inline int device_suspend(pm_message_t state) 
#define device_set_wakeup_enable(dev,val)	do{}while(0)

#define device_may_wakeup(dev)			(0)



static inline int dpm_runtime_suspend(struct device * dev, pm_message_t state)

{

	return 0;

}



static inline void dpm_runtime_resume(struct device * dev)

{



}



#endif



/* changes to device_may_wakeup take effect on the next pm state change.

CRA Git | Maintained and supported by SUSTech CRA and CCSE