Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753575Ab2F2Ltc (ORCPT ); Fri, 29 Jun 2012 07:49:32 -0400 Received: from trem.minaslivre.org ([74.50.53.205]:36465 "EHLO grilo.cascardo.info" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751258Ab2F2Lt3 (ORCPT ); Fri, 29 Jun 2012 07:49:29 -0400 X-Greylist: delayed 536 seconds by postgrey-1.27 at vger.kernel.org; Fri, 29 Jun 2012 07:49:29 EDT From: Thadeu Cascardo Reply-To: Thadeu Cascardo To: "Rafael J. Wysocki" , Linux PM list Cc: ACPI Devel Mailing List , LKML , Len Brown , Matthew Garrett , platform-driver-x86@vger.kernel.org, Eric Piel , Mattia Dongili , Harald Welte , Daniel Oliveira Nascimento Subject: Re: [PATCH missing/21] classmate-laptop: Use struct dev_pm_ops for power management X-Mailer: Modest 3.2 References: <201206232306.06602.rjw@sisk.pl> <201206290011.53618.rjw@sisk.pl> In-Reply-To: <201206290011.53618.rjw@sisk.pl> Content-Type: text/plain; charset=utf-8 Content-ID: <1340969992.24166.1.camel@Nokia-N900> Date: Fri, 29 Jun 2012 08:39:53 -0300 Message-Id: <1340969993.24166.2.camel@Nokia-N900> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2467 Lines: 71 ----- Original message ----- > From: Rafael J. Wysocki > > Make the classmate-laptop 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 > --- > > Hi all, > > I overlooked the classmate-laptop driver in the ACPI conversion to PM > handling based on struct dev_pm_ops, so this one should go after [17/21] > and the next patches should be renumbered. > > Thanks, > Rafael > > > --- >  drivers/platform/x86/classmate-laptop.c |    13 ++++++++----- >  1 file changed, 8 insertions(+), 5 deletions(-) > > Index: linux/drivers/platform/x86/classmate-laptop.c > =================================================================== > --- linux.orig/drivers/platform/x86/classmate-laptop.c > +++ linux/drivers/platform/x86/classmate-laptop.c > @@ -362,15 +362,18 @@ static int cmpc_tablet_remove(struct acp >      return cmpc_remove_acpi_notify_device(acpi); >  } >  > -static int cmpc_tablet_resume(struct acpi_device *acpi) > +static int cmpc_tablet_resume(struct device *dev) >  { > -    struct input_dev *inputdev = dev_get_drvdata(&acpi->dev); > +    struct input_dev *inputdev = dev_get_drvdata(dev); > + >      unsigned long long val = 0; > -    if (ACPI_SUCCESS(cmpc_get_tablet(acpi->handle, &val))) > +    if (ACPI_SUCCESS(cmpc_get_tablet(to_acpi_device(dev)->handle, &val))) >          input_report_switch(inputdev, SW_TABLET_MODE, !val); >      return 0; >  } >  > +static SIMPLE_DEV_PM_OPS(cmpc_tabled_pm, NULL, cmpc_tablet_resume); > + >  static const struct acpi_device_id cmpc_tablet_device_ids[] = { >      {CMPC_TABLET_HID, 0}, >      {"", 0} > @@ -384,9 +387,9 @@ static struct acpi_driver cmpc_tablet_ac >      .ops = { >          .add = cmpc_tablet_add, >          .remove = cmpc_tablet_remove, > -        .resume = cmpc_tablet_resume, >          .notify = cmpc_tablet_handler, > -    } > +    }, > +    .drv.pm = &cmpc_tabled_pm, >  }; >  >  Aside from the typo tabled, Acked-by: Thadeu Lima de Souza Cascardo -- 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/