[PATCH v2 1/5] ACPI: move acpi_os_handler() so it can be made arch-dependent later

[Rafael J. Wysocki]

On Wednesday, February 04, 2015 03:44:50 PM Al Stone wrote:
> On 02/04/2015 06:50 AM, Rafael J. Wysocki wrote:
> > On Tuesday, February 03, 2015 05:21:40 PM al.stone at linaro.org wrote:
> >> From: Al Stone <al.stone at linaro.org>
> >>
> >> In order to deprecate the use of _OSI for arm64 or other new architectures,
> >> we need to make the default handler something we can change for various
> >> platforms.  This patch moves the definition of acpi_osi_handler() -- the
> >> function used by ACPICA as a callback for evaluating _OSI -- into a separate
> >> file.  Subsequent patches will change which files get built so that we can
> >> then build the version of _OSI we need for a particular architecture.
> >>
> >> There is no functional change.
> >>
> >> Signed-off-by: Al Stone <al.stone at linaro.org>
> >> ---
> >>  drivers/acpi/Makefile |   2 +-
> >>  drivers/acpi/osi.c    | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++
> >>  drivers/acpi/osl.c    |  24 ------------
> >>  include/linux/acpi.h  |   1 +
> >>  4 files changed, 102 insertions(+), 25 deletions(-)
> >>  create mode 100644 drivers/acpi/osi.c
> >>
> >> diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
> >> index c346011..df348b3 100644
> >> --- a/drivers/acpi/Makefile
> >> +++ b/drivers/acpi/Makefile
> >> @@ -18,7 +18,7 @@ obj-y				+= acpi.o \
> >>  					acpica/
> >>  
> >>  # All the builtin files are in the "acpi." module_param namespace.
> >> -acpi-y				+= osl.o utils.o reboot.o
> >> +acpi-y				+= osl.o utils.o reboot.o osi.o
> >>  acpi-y				+= nvs.o
> >>  
> >>  # Power management related files
> >> diff --git a/drivers/acpi/osi.c b/drivers/acpi/osi.c
> >> new file mode 100644
> >> index 0000000..fff2b0c
> >> --- /dev/null
> >> +++ b/drivers/acpi/osi.c
> >> @@ -0,0 +1,100 @@
> >> +/*
> >> + *  osi.c - _OSI implementation (moved from drivers/acpi/osl.c)
> >> + *
> >> + *  Copyright (C) 2000       Andrew Henroid
> >> + *  Copyright (C) 2001, 2002 Andy Grover <andrew.grover at intel.com>
> >> + *  Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh at intel.com>
> >> + *  Copyright (c) 2008 Intel Corporation
> >> + *   Author: Matthew Wilcox <willy at linux.intel.com>
> >> + *
> >> + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> >> + *
> >> + *  This program is free software; you can redistribute it and/or modify
> >> + *  it under the terms of the GNU General Public License as published by
> >> + *  the Free Software Foundation; either version 2 of the License, or
> >> + *  (at your option) any later version.
> >> + *
> >> + *  This program is distributed in the hope that it will be useful,
> >> + *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> >> + *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> >> + *  GNU General Public License for more details.
> > 
> > Nit: The street address of the FSF is not really useful here.  What if they move? :-)
> 
> This was one of the things checkpatch complained about, understandably :).  It's
> a direct cut'n'paste from osl.c.
> 
> I can clean these up in the new file; would it help to clean up osl.c (at least
> from checkpatch's point of view), as long as I'm at it?

Yeah, won't hurt. :-)

In a separate patch please, though.


-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.