diff options
author | Len Brown <len.brown@intel.com> | 2007-02-15 22:46:42 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-02-15 22:46:42 -0500 |
commit | 8d4956c201c2f7683289f70095443c59a39f94ef (patch) | |
tree | 49a84169b5a673553353991bc0cf9418ef954100 /drivers | |
parent | 243b66e76ab722cdec1921d7f80c0cb808131c37 (diff) |
ACPI: remove non-PNPACPI version of get_rtc_dev()
It isn't needed in ACPI code anymore because
now ACPI always includes PNPACPI.
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/acpi/glue.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c index 99500871e3fe..4334c208841a 100644 --- a/drivers/acpi/glue.c +++ b/drivers/acpi/glue.c | |||
@@ -255,8 +255,6 @@ arch_initcall(init_acpi_device_notify); | |||
255 | static struct cmos_rtc_board_info rtc_info; | 255 | static struct cmos_rtc_board_info rtc_info; |
256 | 256 | ||
257 | 257 | ||
258 | #ifdef CONFIG_PNPACPI | ||
259 | |||
260 | /* PNP devices are registered in a subsys_initcall(); | 258 | /* PNP devices are registered in a subsys_initcall(); |
261 | * ACPI specifies the PNP IDs to use. | 259 | * ACPI specifies the PNP IDs to use. |
262 | */ | 260 | */ |
@@ -280,31 +278,6 @@ static struct device *__init get_rtc_dev(void) | |||
280 | return bus_find_device(&pnp_bus_type, NULL, NULL, pnp_match); | 278 | return bus_find_device(&pnp_bus_type, NULL, NULL, pnp_match); |
281 | } | 279 | } |
282 | 280 | ||
283 | #else | ||
284 | |||
285 | /* We expect non-PNPACPI platforms to register an RTC device, usually | ||
286 | * at or near arch_initcall(). That also helps for example PCs that | ||
287 | * aren't configured with ACPI (where this code wouldn't run, but the | ||
288 | * RTC would still be available). The device name matches the driver; | ||
289 | * that's how the platform bus works. | ||
290 | */ | ||
291 | #include <linux/platform_device.h> | ||
292 | |||
293 | static int __init platform_match(struct device *dev, void *data) | ||
294 | { | ||
295 | struct platform_device *pdev; | ||
296 | |||
297 | pdev = container_of(dev, struct platform_device, dev); | ||
298 | return strcmp(pdev->name, "rtc_cmos") == 0; | ||
299 | } | ||
300 | |||
301 | static struct device *__init get_rtc_dev(void) | ||
302 | { | ||
303 | return bus_find_device(&platform_bus_type, NULL, NULL, platform_match); | ||
304 | } | ||
305 | |||
306 | #endif | ||
307 | |||
308 | static int __init acpi_rtc_init(void) | 281 | static int __init acpi_rtc_init(void) |
309 | { | 282 | { |
310 | struct device *dev = get_rtc_dev(); | 283 | struct device *dev = get_rtc_dev(); |