Skip to contentSkip to conversation

asic3: move probe functions into __init section

PATCH In review Philipp Zabel 2 participants 3 messages Jun 18, 2008 Multifunction devices (MFD)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 asic3: move probe functions into __init section

Potentially free some memory by moving the _probe functions into __init.

---
 drivers/mfd/asic3.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)
drivers/mfd/asic3.c +4 -5
index ef8a492..7d3488d 100644
@@ -295,7 +295,7 @@ static struct irq_chip asic3_irq_chip = {
 	.unmask		= asic3_unmask_irq,
 };
 
-static int asic3_irq_probe(struct platform_device *pdev)
+static int __init asic3_irq_probe(struct platform_device *pdev)
 {
 	struct asic3 *asic = platform_get_drvdata(pdev);
 	unsigned long clksel = 0;
@@ -443,7 +443,7 @@ void asic3_gpio_set_value(struct asic3 *asic, unsigned gpio, int val)
 }
 EXPORT_SYMBOL(asic3_gpio_set_value);
 
-static int asic3_gpio_probe(struct platform_device *pdev)
+static int __init asic3_gpio_probe(struct platform_device *pdev)
 {
 	struct asic3_platform_data *pdata = pdev->dev.platform_data;
 	struct asic3 *asic = platform_get_drvdata(pdev);
@@ -482,7 +482,7 @@ static void asic3_gpio_remove(struct platform_device *pdev)
 
 
 /* Core */
-static int asic3_probe(struct platform_device *pdev)
+static int __init asic3_probe(struct platform_device *pdev)
 {
 	struct asic3_platform_data *pdata = pdev->dev.platform_data;
 	struct asic3 *asic;
@@ -573,7 +573,6 @@ static struct platform_driver asic3_device_driver = {
 	.driver		= {
 		.name	= "asic3",
 	},
-	.probe		= asic3_probe,
 	.remove		= __devexit_p(asic3_remove),
 	.shutdown	= asic3_shutdown,
 };
@@ -581,7 +580,7 @@ static struct platform_driver asic3_device_driver = {
 static int __init asic3_init(void)
 {
 	int retval = 0;
-	retval = platform_driver_register(&asic3_device_driver);
+	retval = platform_driver_probe(&asic3_device_driver, asic3_probe);
 	return retval;
 }
 
Signature · 1 line
1.5.5.4
#1 lore raw

Hi Philipp,

Quoted 3 lines · Philipp Zabel

Potentially free some memory by moving the _probe functions into __init.

This one looks good to me, I'll submit push it to -mm as I'd prefer asic3 patches to go through there first.

Cheers,
Samuel.

Quoted 56 lines
---
 drivers/mfd/asic3.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)
drivers/mfd/asic3.c +4 -5
index ef8a492..7d3488d 100644
@@ -295,7 +295,7 @@ static struct irq_chip asic3_irq_chip = {
 	.unmask		= asic3_unmask_irq,
 };
 
-static int asic3_irq_probe(struct platform_device *pdev)
+static int __init asic3_irq_probe(struct platform_device *pdev)
 {
 	struct asic3 *asic = platform_get_drvdata(pdev);
 	unsigned long clksel = 0;
@@ -443,7 +443,7 @@ void asic3_gpio_set_value(struct asic3 *asic, unsigned gpio, int val)
 }
 EXPORT_SYMBOL(asic3_gpio_set_value);
 
-static int asic3_gpio_probe(struct platform_device *pdev)
+static int __init asic3_gpio_probe(struct platform_device *pdev)
 {
 	struct asic3_platform_data *pdata = pdev->dev.platform_data;
 	struct asic3 *asic = platform_get_drvdata(pdev);
@@ -482,7 +482,7 @@ static void asic3_gpio_remove(struct platform_device *pdev)
 
 
 /* Core */
-static int asic3_probe(struct platform_device *pdev)
+static int __init asic3_probe(struct platform_device *pdev)
 {
 	struct asic3_platform_data *pdata = pdev->dev.platform_data;
 	struct asic3 *asic;
@@ -573,7 +573,6 @@ static struct platform_driver asic3_device_driver = {
 	.driver		= {
 		.name	= "asic3",
 	},
-	.probe		= asic3_probe,
 	.remove		= __devexit_p(asic3_remove),
 	.shutdown	= asic3_shutdown,
 };
@@ -581,7 +580,7 @@ static struct platform_driver asic3_device_driver = {
 static int __init asic3_init(void)
 {
 	int retval = 0;
-	retval = platform_driver_register(&asic3_device_driver);
+	retval = platform_driver_probe(&asic3_device_driver, asic3_probe);
 	return retval;
 }
 
Signature · 1 line
1.5.5.4
#2 lore raw
Quoted 8 lines · Samuel Ortiz

Hi Philipp,

Quoted 3 lines · Philipp Zabel

Potentially free some memory by moving the _probe functions into __init.

This one looks good to me, I'll submit push it to -mm as I'd prefer asic3 patches to go through there first.

That's fine with me, thanks.

regards
Philipp