From: Len Brown <lenb@kernel.org>
To: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: linux-acpi@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
Naveen B S <naveen.b.s@intel.com>,
Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Subject: Re: [patch] ACPI: Remove duplicate definitions for _STA bits
Date: Wed, 25 Apr 2007 14:16:14 -0400 [thread overview]
Message-ID: <200704251416.14655.lenb@kernel.org> (raw)
In-Reply-To: <200704201056.48764.bjorn.helgaas@hp.com>
Applied.
thanks,
-Len
On Friday 20 April 2007 12:56, Bjorn Helgaas wrote:
> No need to duplicate the existing definitions in include/acpi/actypes.h.
>
> Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
>
> Index: w/drivers/acpi/acpi_memhotplug.c
> ===================================================================
> --- w.orig/drivers/acpi/acpi_memhotplug.c 2007-04-19 21:14:41.000000000 -0600
> +++ w/drivers/acpi/acpi_memhotplug.c 2007-04-19 21:25:33.000000000 -0600
> @@ -44,11 +44,6 @@
> MODULE_DESCRIPTION("Hotplug Mem Driver");
> MODULE_LICENSE("GPL");
>
> -/* ACPI _STA method values */
> -#define ACPI_MEMORY_STA_PRESENT (0x00000001UL)
> -#define ACPI_MEMORY_STA_ENABLED (0x00000002UL)
> -#define ACPI_MEMORY_STA_FUNCTIONAL (0x00000008UL)
> -
> /* Memory Device States */
> #define MEMORY_INVALID_STATE 0
> #define MEMORY_POWER_ON_STATE 1
> @@ -204,9 +199,9 @@
> * Check for device status. Device should be
> * present/enabled/functioning.
> */
> - if (!((current_status & ACPI_MEMORY_STA_PRESENT)
> - && (current_status & ACPI_MEMORY_STA_ENABLED)
> - && (current_status & ACPI_MEMORY_STA_FUNCTIONAL)))
> + if (!((current_status & ACPI_STA_DEVICE_PRESENT)
> + && (current_status & ACPI_STA_DEVICE_ENABLED)
> + && (current_status & ACPI_STA_DEVICE_FUNCTIONING)))
> return -ENODEV;
>
> return 0;
> @@ -286,7 +281,7 @@
> return -ENODEV;
>
> /* Check for device status. Device should be disabled */
> - if (current_status & ACPI_MEMORY_STA_ENABLED)
> + if (current_status & ACPI_STA_DEVICE_ENABLED)
> return -EINVAL;
>
> return 0;
> Index: w/drivers/acpi/container.c
> ===================================================================
> --- w.orig/drivers/acpi/container.c 2007-04-19 21:14:41.000000000 -0600
> +++ w/drivers/acpi/container.c 2007-04-19 21:14:44.000000000 -0600
> @@ -49,8 +49,6 @@
> MODULE_DESCRIPTION("ACPI container driver");
> MODULE_LICENSE("GPL");
>
> -#define ACPI_STA_PRESENT (0x00000001)
> -
> static int acpi_container_add(struct acpi_device *device);
> static int acpi_container_remove(struct acpi_device *device, int type);
>
> @@ -75,13 +73,13 @@
>
> status = acpi_get_handle(handle, "_STA", &temp);
> if (ACPI_FAILURE(status))
> - return 1; /* _STA not found, assmue device present */
> + return 1; /* _STA not found, assume device present */
>
> status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);
> if (ACPI_FAILURE(status))
> return 0; /* Firmware error */
>
> - return ((sta & ACPI_STA_PRESENT) == ACPI_STA_PRESENT);
> + return ((sta & ACPI_STA_DEVICE_PRESENT) == ACPI_STA_DEVICE_PRESENT);
> }
>
> /*******************************************************************/
> Index: w/drivers/acpi/processor_core.c
> ===================================================================
> --- w.orig/drivers/acpi/processor_core.c 2007-04-19 21:14:41.000000000 -0600
> +++ w/drivers/acpi/processor_core.c 2007-04-19 21:14:44.000000000 -0600
> @@ -71,8 +71,6 @@
> #define ACPI_PROCESSOR_LIMIT_USER 0
> #define ACPI_PROCESSOR_LIMIT_THERMAL 1
>
> -#define ACPI_STA_PRESENT 0x00000001
> -
> #define _COMPONENT ACPI_PROCESSOR_COMPONENT
> ACPI_MODULE_NAME("processor_core");
>
> @@ -780,7 +778,7 @@
>
>
> status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);
> - if (ACPI_FAILURE(status) || !(sta & ACPI_STA_PRESENT)) {
> + if (ACPI_FAILURE(status) || !(sta & ACPI_STA_DEVICE_PRESENT)) {
> ACPI_EXCEPTION((AE_INFO, status, "Processor Device is not present"));
> return 0;
> }
>
prev parent reply other threads:[~2007-04-25 18:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-04-20 16:56 [patch] ACPI: Remove duplicate definitions for _STA bits Bjorn Helgaas
2007-04-25 18:16 ` Len Brown [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200704251416.14655.lenb@kernel.org \
--to=lenb@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=anil.s.keshavamurthy@intel.com \
--cc=bjorn.helgaas@hp.com \
--cc=linux-acpi@vger.kernel.org \
--cc=naveen.b.s@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.