From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934211AbZHEMqq (ORCPT ); Wed, 5 Aug 2009 08:46:46 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S933169AbZHEMqp (ORCPT ); Wed, 5 Aug 2009 08:46:45 -0400 Received: from buzzloop.caiaq.de ([212.112.241.133]:55350 "EHLO buzzloop.caiaq.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933122AbZHEMqo (ORCPT ); Wed, 5 Aug 2009 08:46:44 -0400 From: Daniel Mack To: linux-kernel@vger.kernel.org Cc: Daniel Mack , Szabolcs Gyurko , Matt Reimer , Anton Vorontsov Subject: [PATCH 1/2] ds2760: switch to new dev_pm_ops Date: Wed, 5 Aug 2009 14:46:27 +0200 Message-Id: <1249476387-27325-1-git-send-email-daniel@caiaq.de> X-Mailer: git-send-email 1.6.3.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Daniel Mack Cc: Szabolcs Gyurko Cc: Matt Reimer Cc: Anton Vorontsov --- drivers/power/ds2760_battery.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/drivers/power/ds2760_battery.c b/drivers/power/ds2760_battery.c index ca43b1c..ad2d615 100644 --- a/drivers/power/ds2760_battery.c +++ b/drivers/power/ds2760_battery.c @@ -557,19 +557,18 @@ static int ds2760_battery_remove(struct platform_device *pdev) #ifdef CONFIG_PM -static int ds2760_battery_suspend(struct platform_device *pdev, - pm_message_t state) +static int ds2760_battery_suspend(struct device *dev) { - struct ds2760_device_info *di = platform_get_drvdata(pdev); + struct ds2760_device_info *di = dev_get_drvdata(dev); di->charge_status = POWER_SUPPLY_STATUS_UNKNOWN; return 0; } -static int ds2760_battery_resume(struct platform_device *pdev) +static int ds2760_battery_resume(struct device *dev) { - struct ds2760_device_info *di = platform_get_drvdata(pdev); + struct ds2760_device_info *di = dev_get_drvdata(dev); di->charge_status = POWER_SUPPLY_STATUS_UNKNOWN; power_supply_changed(&di->bat); @@ -580,23 +579,27 @@ static int ds2760_battery_resume(struct platform_device *pdev) return 0; } -#else +static struct dev_pm_ops ds2760_battery_pm_ops = { + .suspend = ds2760_battery_suspend, + .resume = ds2760_battery_resume, +}; -#define ds2760_battery_suspend NULL -#define ds2760_battery_resume NULL +#define DS2760_PM_OPS (&ds2760_battery_pm_ops) +#else +#define DS2760_PM_OPS NULL #endif /* CONFIG_PM */ MODULE_ALIAS("platform:ds2760-battery"); static struct platform_driver ds2760_battery_driver = { .driver = { - .name = "ds2760-battery", + .owner = THIS_MODULE, + .name = "ds2760-battery", + .pm = DS2760_PM_OPS, }, .probe = ds2760_battery_probe, .remove = ds2760_battery_remove, - .suspend = ds2760_battery_suspend, - .resume = ds2760_battery_resume, }; static int __init ds2760_battery_init(void) -- 1.6.3.3