From 4a29094bdf6ff382b7558e242ddb91c67fc200c7 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Mon, 24 May 2010 23:37:19 +0200 Subject: MFD: pcf50633: Use mfd cells to register child devices This patch changes the pcf50633 core code to use mfd cells to register child devices instead of calling platform_device_{alloc,add} for each child. Signed-off-by: Lars-Peter Clausen --- drivers/mfd/pcf50633-adc.c | 16 ++--- drivers/mfd/pcf50633-core.c | 101 +++++++++++---------------- drivers/power/pcf50633-charger.c | 13 ++-- drivers/regulator/pcf50633-regulator.c | 3 +- drivers/video/backlight/pcf50633-backlight.c | 8 ++- 5 files changed, 64 insertions(+), 77 deletions(-) (limited to 'drivers') diff --git a/drivers/mfd/pcf50633-adc.c b/drivers/mfd/pcf50633-adc.c index aed0d2a9b03..bf77c8f9f6a 100644 --- a/drivers/mfd/pcf50633-adc.c +++ b/drivers/mfd/pcf50633-adc.c @@ -51,11 +51,6 @@ struct pcf50633_adc { struct mutex queue_mutex; }; -static inline struct pcf50633_adc *__to_adc(struct pcf50633 *pcf) -{ - return platform_get_drvdata(pcf->adc_pdev); -} - static void adc_setup(struct pcf50633 *pcf, int channel, int avg) { channel &= PCF50633_ADCC1_ADCMUX_MASK; @@ -71,7 +66,7 @@ static void adc_setup(struct pcf50633 *pcf, int channel, int avg) static void trigger_next_adc_job_if_any(struct pcf50633 *pcf) { - struct pcf50633_adc *adc = __to_adc(pcf); + struct pcf50633_adc *adc = pcf->adc; int head; head = adc->queue_head; @@ -85,7 +80,7 @@ static void trigger_next_adc_job_if_any(struct pcf50633 *pcf) static int adc_enqueue_request(struct pcf50633 *pcf, struct pcf50633_adc_request *req) { - struct pcf50633_adc *adc = __to_adc(pcf); + struct pcf50633_adc *adc = pcf->adc; int head, tail; mutex_lock(&adc->queue_mutex); @@ -201,13 +196,14 @@ static void pcf50633_adc_irq(int irq, void *data) static int __devinit pcf50633_adc_probe(struct platform_device *pdev) { + struct pcf50633 *pcf = dev_to_pcf50633(pdev->dev.parent); struct pcf50633_adc *adc; adc = kzalloc(sizeof(*adc), GFP_KERNEL); if (!adc) return -ENOMEM; - adc->pcf = dev_to_pcf50633(pdev->dev.parent); + adc->pcf = pcf; platform_set_drvdata(pdev, adc); pcf50633_register_irq(adc->pcf, PCF50633_IRQ_ADCRDY, @@ -215,6 +211,8 @@ static int __devinit pcf50633_adc_probe(struct platform_device *pdev) mutex_init(&adc->queue_mutex); + pcf->adc = adc; + return 0; } @@ -223,6 +221,8 @@ static int __devexit pcf50633_adc_remove(struct platform_device *pdev) struct pcf50633_adc *adc = platform_get_drvdata(pdev); int i, head; + adc->pcf->adc = NULL; + pcf50633_free_irq(adc->pcf, PCF50633_IRQ_ADCRDY); mutex_lock(&adc->queue_mutex); diff --git a/drivers/mfd/pcf50633-core.c b/drivers/mfd/pcf50633-core.c index 9c14dbf02b0..dfb25583170 100644 --- a/drivers/mfd/pcf50633-core.c +++ b/drivers/mfd/pcf50633-core.c @@ -23,6 +23,8 @@ #include #include +#include + #include int pcf50633_irq_init(struct pcf50633 *pcf, int irq); @@ -215,28 +217,6 @@ static struct attribute_group pcf_attr_group = { .attrs = pcf_sysfs_entries, }; -static void -pcf50633_client_dev_register(struct pcf50633 *pcf, const char *name, - struct platform_device **pdev) -{ - int ret; - - *pdev = platform_device_alloc(name, -1); - if (!*pdev) { - dev_err(pcf->dev, "Falied to allocate %s\n", name); - return; - } - - (*pdev)->dev.parent = pcf->dev; - - ret = platform_device_add(*pdev); - if (ret) { - dev_err(pcf->dev, "Failed to register %s: %d\n", name, ret); - platform_device_put(*pdev); - *pdev = NULL; - } -} - #ifdef CONFIG_PM static int pcf50633_suspend(struct i2c_client *client, pm_message_t state) { @@ -258,12 +238,43 @@ static int pcf50633_resume(struct i2c_client *client) #define pcf50633_resume NULL #endif +#define PCF50633_CELL(_name) \ + { \ + .name = _name, \ + } \ + +#define PCF50633_CELL_ID(_name, _id) \ + { \ + .name = _name, \ + .id = _id, \ + } \ + +static struct mfd_cell pcf50633_cells[] = { + PCF50633_CELL("pcf50633-input"), + PCF50633_CELL("pcf50633-rtc"), + PCF50633_CELL("pcf50633-mbc"), + PCF50633_CELL("pcf50633-adc"), + PCF50633_CELL("pcf50633-backlight"), + PCF50633_CELL("pcf50633-gpio"), + PCF50633_CELL_ID("pcf50633-regltr", 0), + PCF50633_CELL_ID("pcf50633-regltr", 1), + PCF50633_CELL_ID("pcf50633-regltr", 2), + PCF50633_CELL_ID("pcf50633-regltr", 3), + PCF50633_CELL_ID("pcf50633-regltr", 4), + PCF50633_CELL_ID("pcf50633-regltr", 5), + PCF50633_CELL_ID("pcf50633-regltr", 6), + PCF50633_CELL_ID("pcf50633-regltr", 7), + PCF50633_CELL_ID("pcf50633-regltr", 8), + PCF50633_CELL_ID("pcf50633-regltr", 9), + PCF50633_CELL_ID("pcf50633-regltr", 10), +}; + static int __devinit pcf50633_probe(struct i2c_client *client, const struct i2c_device_id *ids) { struct pcf50633 *pcf; struct pcf50633_platform_data *pdata = client->dev.platform_data; - int i, ret; + int ret; int version, variant; if (!client->irq) { @@ -296,35 +307,11 @@ static int __devinit pcf50633_probe(struct i2c_client *client, pcf50633_irq_init(pcf, client->irq); - /* Create sub devices */ - pcf50633_client_dev_register(pcf, "pcf50633-input", - &pcf->input_pdev); - pcf50633_client_dev_register(pcf, "pcf50633-rtc", - &pcf->rtc_pdev); - pcf50633_client_dev_register(pcf, "pcf50633-mbc", - &pcf->mbc_pdev); - pcf50633_client_dev_register(pcf, "pcf50633-adc", - &pcf->adc_pdev); - pcf50633_client_dev_register(pcf, "pcf50633-backlight", - &pcf->bl_pdev); - pcf50633_client_dev_register(pcf, "pcf50633-gpio", - &pcf->gpio_pdev); - - for (i = 0; i < PCF50633_NUM_REGULATORS; i++) { - struct platform_device *pdev; - - pdev = platform_device_alloc("pcf50633-regltr", i); - if (!pdev) { - dev_err(pcf->dev, "Cannot create regulator %d\n", i); - continue; - } - - pdev->dev.parent = pcf->dev; - platform_device_add_data(pdev, &pdata->reg_init_data[i], - sizeof(pdata->reg_init_data[i])); - pcf->regulator_pdev[i] = pdev; - - platform_device_add(pdev); + ret = mfd_add_devices(pcf->dev, 0, pcf50633_cells, + ARRAY_SIZE(pcf50633_cells), NULL, 0); + if (ret) { + dev_err(pcf->dev, "Failed to add mfd cells.\n"); + goto err_free; } ret = sysfs_create_group(&client->dev.kobj, &pcf_attr_group); @@ -346,18 +333,10 @@ err_free: static int __devexit pcf50633_remove(struct i2c_client *client) { struct pcf50633 *pcf = i2c_get_clientdata(client); - int i; pcf50633_irq_free(pcf); - platform_device_unregister(pcf->gpio_pdev); - platform_device_unregister(pcf->input_pdev); - platform_device_unregister(pcf->rtc_pdev); - platform_device_unregister(pcf->mbc_pdev); - platform_device_unregister(pcf->adc_pdev); - - for (i = 0; i < PCF50633_NUM_REGULATORS; i++) - platform_device_unregister(pcf->regulator_pdev[i]); + mfd_remove_devices(pcf->dev); kfree(pcf); diff --git a/drivers/power/pcf50633-charger.c b/drivers/power/pcf50633-charger.c index 066f994e6fe..f7114858eb1 100644 --- a/drivers/power/pcf50633-charger.c +++ b/drivers/power/pcf50633-charger.c @@ -40,7 +40,7 @@ struct pcf50633_mbc { int pcf50633_mbc_usb_curlim_set(struct pcf50633 *pcf, int ma) { - struct pcf50633_mbc *mbc = platform_get_drvdata(pcf->mbc_pdev); + struct pcf50633_mbc *mbc = pcf->mbc; int ret = 0; u8 bits; int charging_start = 1; @@ -112,7 +112,7 @@ EXPORT_SYMBOL_GPL(pcf50633_mbc_usb_curlim_set); int pcf50633_mbc_get_status(struct pcf50633 *pcf) { - struct pcf50633_mbc *mbc = platform_get_drvdata(pcf->mbc_pdev); + struct pcf50633_mbc *mbc = pcf->mbc; int status = 0; u8 chgmod; @@ -143,7 +143,7 @@ EXPORT_SYMBOL_GPL(pcf50633_mbc_get_status); int pcf50633_mbc_get_usb_online_status(struct pcf50633 *pcf) { - struct pcf50633_mbc *mbc = platform_get_drvdata(pcf->mbc_pdev); + struct pcf50633_mbc *mbc = pcf->mbc; if (!mbc) return 0; @@ -368,6 +368,7 @@ static const u8 mbc_irq_handlers[] = { static int __devinit pcf50633_mbc_probe(struct platform_device *pdev) { + struct pcf50633 *pcf = dev_to_pcf50633(pdev->dev.parent); struct pcf50633_mbc *mbc; int ret; int i; @@ -378,7 +379,7 @@ static int __devinit pcf50633_mbc_probe(struct platform_device *pdev) return -ENOMEM; platform_set_drvdata(pdev, mbc); - mbc->pcf = dev_to_pcf50633(pdev->dev.parent); + mbc->pcf = pcf; /* Set up IRQ handlers */ for (i = 0; i < ARRAY_SIZE(mbc_irq_handlers); i++) @@ -444,6 +445,8 @@ static int __devinit pcf50633_mbc_probe(struct platform_device *pdev) if (mbcs1 & PCF50633_MBCS1_ADAPTPRES) pcf50633_mbc_irq_handler(PCF50633_IRQ_ADPINS, mbc); + pcf->mbc = mbc; + return 0; } @@ -452,6 +455,8 @@ static int __devexit pcf50633_mbc_remove(struct platform_device *pdev) struct pcf50633_mbc *mbc = platform_get_drvdata(pdev); int i; + mbc->pcf->mbc = NULL; + /* Remove IRQ handlers */ for (i = 0; i < ARRAY_SIZE(mbc_irq_handlers); i++) pcf50633_free_irq(mbc->pcf, mbc_irq_handlers[i]); diff --git a/drivers/regulator/pcf50633-regulator.c b/drivers/regulator/pcf50633-regulator.c index c8f41dc05b7..6ef66d971a8 100644 --- a/drivers/regulator/pcf50633-regulator.c +++ b/drivers/regulator/pcf50633-regulator.c @@ -313,11 +313,10 @@ static int __devinit pcf50633_regulator_probe(struct platform_device *pdev) struct regulator_dev *rdev; struct pcf50633 *pcf; - /* Already set by core driver */ pcf = dev_to_pcf50633(pdev->dev.parent); rdev = regulator_register(®ulators[pdev->id], &pdev->dev, - pdev->dev.platform_data, pcf); + &pcf->pdata->reg_init_data[pdev->id], pcf); if (IS_ERR(rdev)) return PTR_ERR(rdev); diff --git a/drivers/video/backlight/pcf50633-backlight.c b/drivers/video/backlight/pcf50633-backlight.c index 5b72089c9c3..fbcb0ea82f0 100644 --- a/drivers/video/backlight/pcf50633-backlight.c +++ b/drivers/video/backlight/pcf50633-backlight.c @@ -44,7 +44,7 @@ struct pcf50633_bl { */ int pcf50633_bl_set_brightness_limit(struct pcf50633 *pcf, unsigned int limit) { - struct pcf50633_bl *pcf_bl = platform_get_drvdata(pcf->bl_pdev); + struct pcf50633_bl *pcf_bl = pcf->bl; if (!pcf_bl) return -ENODEV; @@ -102,6 +102,7 @@ static struct backlight_ops pcf50633_bl_ops = { static int __devinit pcf50633_bl_probe(struct platform_device *pdev) { int ret; + struct pcf50633 *pcf = dev_to_pcf50633(pdev->dev.parent); struct pcf50633_bl *pcf_bl; struct pcf50633_platform_data *pcf50633_data = pdev->dev.parent->platform_data; struct pcf50633_bl_platform_data *pdata = pcf50633_data->backlight_data; @@ -122,7 +123,7 @@ static int __devinit pcf50633_bl_probe(struct platform_device *pdev) pcf_bl->brightness_limit = 0x3f; } - pcf_bl->pcf = dev_to_pcf50633(pdev->dev.parent); + pcf_bl->pcf = pcf; pcf_bl->bl = backlight_device_register(pdev->name, &pdev->dev, pcf_bl, &pcf50633_bl_ops, &bl_props); @@ -132,6 +133,7 @@ static int __devinit pcf50633_bl_probe(struct platform_device *pdev) goto err_free; } + pcf->bl = pcf_bl; platform_set_drvdata(pdev, pcf_bl); pcf50633_reg_write(pcf_bl->pcf, PCF50633_REG_LEDDIM, pdata->ramp_time); @@ -154,6 +156,8 @@ static int __devexit pcf50633_bl_remove(struct platform_device *pdev) { struct pcf50633_bl *pcf_bl = platform_get_drvdata(pdev); + pcf_bl->pcf->bl = NULL; + backlight_device_unregister(pcf_bl->bl); platform_set_drvdata(pdev, NULL); -- cgit v1.2.3 From 687d09365fef8fe4bcabb909fe8a5e9a1b0834a2 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Tue, 8 Jun 2010 15:07:13 +0200 Subject: MFD: PCF50633: Use dev_pm_ops instead of legacy i2c suspend/resume callbacks Right now in 2.6.34 the legacy powermanagement callbacks are broken, so we work around it by switching to dev_pm_ops. --- drivers/mfd/pcf50633-core.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'drivers') diff --git a/drivers/mfd/pcf50633-core.c b/drivers/mfd/pcf50633-core.c index dfb25583170..5082c829444 100644 --- a/drivers/mfd/pcf50633-core.c +++ b/drivers/mfd/pcf50633-core.c @@ -218,24 +218,30 @@ static struct attribute_group pcf_attr_group = { }; #ifdef CONFIG_PM -static int pcf50633_suspend(struct i2c_client *client, pm_message_t state) + +static int pcf50633_suspend(struct device *dev) { - struct pcf50633 *pcf; - pcf = i2c_get_clientdata(client); + struct pcf50633 *pcf = dev_get_drvdata(dev); return pcf50633_irq_suspend(pcf); } -static int pcf50633_resume(struct i2c_client *client) +static int pcf50633_resume(struct device *dev) { - struct pcf50633 *pcf; - pcf = i2c_get_clientdata(client); + struct pcf50633 *pcf = dev_get_drvdata(dev); return pcf50633_irq_resume(pcf); } + +static const struct dev_pm_ops pcf50633_pm_ops = { + .suspend = pcf50633_suspend, + .resume = pcf50633_resume, +}; + +#define PCF50633_PM_OPS (&pcf50633_pm_ops) + #else -#define pcf50633_suspend NULL -#define pcf50633_resume NULL +#define PC50633_PM_OPS NULL #endif #define PCF50633_CELL(_name) \ @@ -351,12 +357,11 @@ static struct i2c_device_id pcf50633_id_table[] = { static struct i2c_driver pcf50633_driver = { .driver = { .name = "pcf50633", + .pm = PCF50633_PM_OPS, }, .id_table = pcf50633_id_table, .probe = pcf50633_probe, .remove = __devexit_p(pcf50633_remove), - .suspend = pcf50633_suspend, - .resume = pcf50633_resume, }; static int __init pcf50633_init(void) -- cgit v1.2.3