Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755022Ab2FXMkH (ORCPT ); Sun, 24 Jun 2012 08:40:07 -0400 Received: from mail-ob0-f174.google.com ([209.85.214.174]:45982 "EHLO mail-ob0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752416Ab2FXMkE convert rfc822-to-8bit (ORCPT ); Sun, 24 Jun 2012 08:40:04 -0400 MIME-Version: 1.0 In-Reply-To: <201206232318.18196.rjw@sisk.pl> References: <201206232306.06602.rjw@sisk.pl> <201206232318.18196.rjw@sisk.pl> Date: Sun, 24 Jun 2012 08:40:02 -0400 Message-ID: Subject: Re: [PATCH 16/21] toshiba_bluetooth: Use struct dev_pm_ops for power management From: Vikram Dhillon To: "Rafael J. Wysocki" Cc: Linux PM list , ACPI Devel Mailing List , LKML , Len Brown , Matthew Garrett , platform-driver-x86@vger.kernel.org, Eric Piel , Mattia Dongili , Harald Welte Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3005 Lines: 72 On Sat, Jun 23, 2012 at 5:18 PM, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki > > Make the toshiba_bluetooth driver define its PM callbacks through > a struct dev_pm_ops object rather than by using legacy PM hooks > in struct acpi_device_ops. > > Signed-off-by: Rafael J. Wysocki > --- > ?drivers/platform/x86/toshiba_bluetooth.c | ? 10 ++++++---- > ?1 file changed, 6 insertions(+), 4 deletions(-) > > Index: linux/drivers/platform/x86/toshiba_bluetooth.c > =================================================================== > --- linux.orig/drivers/platform/x86/toshiba_bluetooth.c > +++ linux/drivers/platform/x86/toshiba_bluetooth.c > @@ -34,7 +34,6 @@ MODULE_LICENSE("GPL"); > ?static int toshiba_bt_rfkill_add(struct acpi_device *device); > ?static int toshiba_bt_rfkill_remove(struct acpi_device *device, int type); > ?static void toshiba_bt_rfkill_notify(struct acpi_device *device, u32 event); > -static int toshiba_bt_resume(struct acpi_device *device); > > ?static const struct acpi_device_id bt_device_ids[] = { > ? ? ? ?{ "TOS6205", 0}, > @@ -42,6 +41,9 @@ static const struct acpi_device_id bt_de > ?}; > ?MODULE_DEVICE_TABLE(acpi, bt_device_ids); > > +static int toshiba_bt_resume(struct device *dev); > +static SIMPLE_DEV_PM_OPS(toshiba_bt_pm, NULL, toshiba_bt_resume); > + > ?static struct acpi_driver toshiba_bt_rfkill_driver = { > ? ? ? ?.name = ? ? ? ? "Toshiba BT", > ? ? ? ?.class = ? ? ? ?"Toshiba", > @@ -50,9 +52,9 @@ static struct acpi_driver toshiba_bt_rfk > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?.add = ? ? ? ? ?toshiba_bt_rfkill_add, > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?.remove = ? ? ? toshiba_bt_rfkill_remove, > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?.notify = ? ? ? toshiba_bt_rfkill_notify, > - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? .resume = ? ? ? toshiba_bt_resume, > ? ? ? ? ? ? ? ? ? ? ? ?}, > ? ? ? ?.owner = ? ? ? ?THIS_MODULE, > + ? ? ? .drv.pm = ? ? ? &toshiba_bt_pm, > ?}; > > > @@ -88,9 +90,9 @@ static void toshiba_bt_rfkill_notify(str > ? ? ? ?toshiba_bluetooth_enable(device->handle); > ?} > > -static int toshiba_bt_resume(struct acpi_device *device) > +static int toshiba_bt_resume(struct device *dev) > ?{ > - ? ? ? return toshiba_bluetooth_enable(device->handle); > + ? ? ? return toshiba_bluetooth_enable(to_acpi_device(dev)->handle); > ?} > > ?static int toshiba_bt_rfkill_add(struct acpi_device *device) > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at ?http://vger.kernel.org/majordomo-info.html > Please read the FAQ at ?http://www.tux.org/lkml/ Looks good, will look into the other struct patch (#11) tomorrow. Reviewed-by: Vikram Dhillon -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/