diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-27 20:07:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-27 20:07:01 -0700 |
| commit | 551b0bda46d4caf74755a018e2cdb1d093e000c9 (patch) | |
| tree | aafdf32ae629903c2f200b090de4b36e598d406c /arch/x86 | |
| parent | 4329510c22af1d0cfcc291dc4ce6274abebfe170 (diff) | |
| parent | 8317d5178e7491589693693e5a7f64442cf46ca2 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
mfd: Clean up max8997 IRQ namespace
mfd: Fold irq_set_chip/irq_set_handler
mfd: Cleanup irq namespace
mfd: twl6030: Cleanup interrupt handling
mfd: twl4030: Cleanup interrupt handling
mfd: mx8925: Remove irq_desc leftovers
mfd: htc-i2cpld: Cleanup interrupt handling
mfd: htc-egpio: Cleanup interrupt handling
mfd: ezx-pcap: Remvove open coded irq handling
mfd: 88pm860x: Remove unused irq_desc leftovers
mfd: asic3: Cleanup irq handling
mfd: Select MFD_CORE if TPS6105X driver is configured
mfd: Add MODULE_DEVICE_TABLE to rdc321x-southbridge
mfd: Add MAX8997/8966 IRQ control
mfd: Constify i2c_device_id tables
mfd: OLPC: Clean up names to match what OLPC actually uses
mfd: Add mfd_clone_cell(), convert cs5535-mfd/olpc-xo1 to it
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/platform/olpc/olpc-xo1.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/arch/x86/platform/olpc/olpc-xo1.c b/arch/x86/platform/olpc/olpc-xo1.c index 99513642a0e..ab81fb27176 100644 --- a/arch/x86/platform/olpc/olpc-xo1.c +++ b/arch/x86/platform/olpc/olpc-xo1.c @@ -72,9 +72,9 @@ static int __devinit olpc_xo1_probe(struct platform_device *pdev) dev_err(&pdev->dev, "can't fetch device resource info\n"); return -EIO; } - if (strcmp(pdev->name, "olpc-xo1-pms") == 0) + if (strcmp(pdev->name, "cs5535-pms") == 0) pms_base = res->start; - else if (strcmp(pdev->name, "olpc-xo1-ac-acpi") == 0) + else if (strcmp(pdev->name, "olpc-xo1-pm-acpi") == 0) acpi_base = res->start; /* If we have both addresses, we can override the poweroff hook */ @@ -90,9 +90,9 @@ static int __devexit olpc_xo1_remove(struct platform_device *pdev) { mfd_cell_disable(pdev); - if (strcmp(pdev->name, "olpc-xo1-pms") == 0) + if (strcmp(pdev->name, "cs5535-pms") == 0) pms_base = 0; - else if (strcmp(pdev->name, "olpc-xo1-acpi") == 0) + else if (strcmp(pdev->name, "olpc-xo1-pm-acpi") == 0) acpi_base = 0; pm_power_off = NULL; @@ -101,7 +101,7 @@ static int __devexit olpc_xo1_remove(struct platform_device *pdev) static struct platform_driver cs5535_pms_drv = { .driver = { - .name = "olpc-xo1-pms", + .name = "cs5535-pms", .owner = THIS_MODULE, }, .probe = olpc_xo1_probe, @@ -110,7 +110,7 @@ static struct platform_driver cs5535_pms_drv = { static struct platform_driver cs5535_acpi_drv = { .driver = { - .name = "olpc-xo1-acpi", + .name = "olpc-xo1-pm-acpi", .owner = THIS_MODULE, }, .probe = olpc_xo1_probe, @@ -121,22 +121,21 @@ static int __init olpc_xo1_init(void) { int r; - r = mfd_shared_platform_driver_register(&cs5535_pms_drv, "cs5535-pms"); + r = platform_driver_register(&cs5535_pms_drv); if (r) return r; - r = mfd_shared_platform_driver_register(&cs5535_acpi_drv, - "cs5535-acpi"); + r = platform_driver_register(&cs5535_acpi_drv); if (r) - mfd_shared_platform_driver_unregister(&cs5535_pms_drv); + platform_driver_unregister(&cs5535_pms_drv); return r; } static void __exit olpc_xo1_exit(void) { - mfd_shared_platform_driver_unregister(&cs5535_acpi_drv); - mfd_shared_platform_driver_unregister(&cs5535_pms_drv); + platform_driver_unregister(&cs5535_acpi_drv); + platform_driver_unregister(&cs5535_pms_drv); } MODULE_AUTHOR("Daniel Drake <dsd@laptop.org>"); |