aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd/asic3.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mfd/asic3.c')
-rw-r--r--drivers/mfd/asic3.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
index 9931581b08a1..80dc3334e82f 100644
--- a/drivers/mfd/asic3.c
+++ b/drivers/mfd/asic3.c
@@ -308,7 +308,7 @@ static struct irq_chip asic3_irq_chip = {
308 .unmask = asic3_unmask_irq, 308 .unmask = asic3_unmask_irq,
309}; 309};
310 310
311static int asic3_irq_probe(struct platform_device *pdev) 311static int __init asic3_irq_probe(struct platform_device *pdev)
312{ 312{
313 struct asic3 *asic = platform_get_drvdata(pdev); 313 struct asic3 *asic = platform_get_drvdata(pdev);
314 unsigned long clksel = 0; 314 unsigned long clksel = 0;
@@ -464,8 +464,8 @@ static void asic3_gpio_set(struct gpio_chip *chip,
464 return; 464 return;
465} 465}
466 466
467static int asic3_gpio_probe(struct platform_device *pdev, 467static __init int asic3_gpio_probe(struct platform_device *pdev,
468 u16 *gpio_config, int num) 468 u16 *gpio_config, int num)
469{ 469{
470 struct asic3 *asic = platform_get_drvdata(pdev); 470 struct asic3 *asic = platform_get_drvdata(pdev);
471 u16 alt_reg[ASIC3_NUM_GPIO_BANKS]; 471 u16 alt_reg[ASIC3_NUM_GPIO_BANKS];
@@ -526,7 +526,7 @@ static int asic3_gpio_remove(struct platform_device *pdev)
526 526
527 527
528/* Core */ 528/* Core */
529static int asic3_probe(struct platform_device *pdev) 529static int __init asic3_probe(struct platform_device *pdev)
530{ 530{
531 struct asic3_platform_data *pdata = pdev->dev.platform_data; 531 struct asic3_platform_data *pdata = pdev->dev.platform_data;
532 struct asic3 *asic; 532 struct asic3 *asic;
@@ -633,7 +633,6 @@ static struct platform_driver asic3_device_driver = {
633 .driver = { 633 .driver = {
634 .name = "asic3", 634 .name = "asic3",
635 }, 635 },
636 .probe = asic3_probe,
637 .remove = __devexit_p(asic3_remove), 636 .remove = __devexit_p(asic3_remove),
638 .shutdown = asic3_shutdown, 637 .shutdown = asic3_shutdown,
639}; 638};
@@ -641,7 +640,7 @@ static struct platform_driver asic3_device_driver = {
641static int __init asic3_init(void) 640static int __init asic3_init(void)
642{ 641{
643 int retval = 0; 642 int retval = 0;
644 retval = platform_driver_register(&asic3_device_driver); 643 retval = platform_driver_probe(&asic3_device_driver, asic3_probe);
645 return retval; 644 return retval;
646} 645}
647 646