diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2007-02-07 16:51:46 -0800 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-02-09 01:18:32 -0500 |
commit | d94d3dff0d5da3bdfcbb424ba5c08534521fd690 (patch) | |
tree | e5b0ff6d15c62a3fdae0427d8cc7251cdb0e0fab /include/acpi | |
parent | a74388e21ef2adbba4450f7b3f05ffe88df630d5 (diff) | |
download | linux-stable-d94d3dff0d5da3bdfcbb424ba5c08534521fd690.tar.gz linux-stable-d94d3dff0d5da3bdfcbb424ba5c08534521fd690.tar.bz2 linux-stable-d94d3dff0d5da3bdfcbb424ba5c08534521fd690.zip |
ACPI: bay: fix build warning
drivers/acpi/bay.c: In function 'bay_add':
drivers/acpi/bay.c:310: warning: statement with no effect
Fix it by rewriting those macros in C. Much nicer.
Cc: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi')
-rw-r--r-- | include/acpi/acpi_drivers.h | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index 4dc8a5043ef0..3d7ebe0e4fc2 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h @@ -122,10 +122,24 @@ extern int register_hotplug_dock_device(acpi_handle handle, acpi_notify_handler handler, void *context); extern void unregister_hotplug_dock_device(acpi_handle handle); #else -#define is_dock_device(h) (0) -#define register_dock_notifier(nb) (-ENODEV) -#define unregister_dock_notifier(nb) do { } while(0) -#define register_hotplug_dock_device(h1, h2, c) (-ENODEV) -#define unregister_hotplug_dock_device(h) do { } while(0) +static inline int is_dock_device(acpi_handle handle) +{ + return 0; +} +static inline int register_dock_notifier(struct notifier_block *nb) +{ + return -ENODEV; +} +static inline void unregister_dock_notifier(struct notifier_block *nb) +{ +} +static inline int register_hotplug_dock_device(acpi_handle handle, + acpi_notify_handler handler, void *context) +{ + return -ENODEV; +} +static inline void unregister_hotplug_dock_device(acpi_handle handle) +{ +} #endif #endif /*__ACPI_DRIVERS_H__*/ |