From: Zhang Rui <rui.zhang@intel.com>
To: "Brown, Len" <lenb@kernel.org>
Cc: "linux-acpi@vger.kernel.org" <linux-acpi@vger.kernel.org>,
"Zhang, Rui" <rui.zhang@intel.com>
Subject: [PATCH 6/9] ACPI power_resource: remove unused procfs I/F
Date: Thu, 15 Jul 2010 10:46:38 +0800 [thread overview]
Message-ID: <1279161999.4537.8519.camel@rzhang1-desktop> (raw)
Remove unused ACPI power procfs I/F.
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
---
drivers/acpi/power.c | 128 ---------------------------------------------------
1 file changed, 1 insertion(+), 127 deletions(-)
Index: linux-2.6/drivers/acpi/power.c
===================================================================
--- linux-2.6.orig/drivers/acpi/power.c
+++ linux-2.6/drivers/acpi/power.c
@@ -40,8 +40,6 @@
#include <linux/init.h>
#include <linux/types.h>
#include <linux/slab.h>
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
#include "sleep.h"
@@ -64,7 +62,6 @@ module_param_named(power_nocheck, acpi_p
static int acpi_power_add(struct acpi_device *device);
static int acpi_power_remove(struct acpi_device *device, int type);
static int acpi_power_resume(struct acpi_device *device);
-static int acpi_power_open_fs(struct inode *inode, struct file *file);
static const struct acpi_device_id power_device_ids[] = {
{ACPI_POWER_HID, 0},
@@ -99,14 +96,6 @@ struct acpi_power_resource {
static struct list_head acpi_power_resource_list;
-static const struct file_operations acpi_power_fops = {
- .owner = THIS_MODULE,
- .open = acpi_power_open_fs,
- .read = seq_read,
- .llseek = seq_lseek,
- .release = single_release,
-};
-
/* --------------------------------------------------------------------------
Power Resource Management
-------------------------------------------------------------------------- */
@@ -542,102 +531,6 @@ int acpi_power_transition(struct acpi_de
}
/* --------------------------------------------------------------------------
- FS Interface (/proc)
- -------------------------------------------------------------------------- */
-
-static struct proc_dir_entry *acpi_power_dir;
-
-static int acpi_power_seq_show(struct seq_file *seq, void *offset)
-{
- int count = 0;
- int result = 0, state;
- struct acpi_power_resource *resource = NULL;
- struct list_head *node, *next;
- struct acpi_power_reference *ref;
-
-
- resource = seq->private;
-
- if (!resource)
- goto end;
-
- result = acpi_power_get_state(resource->device->handle, &state);
- if (result)
- goto end;
-
- seq_puts(seq, "state: ");
- switch (state) {
- case ACPI_POWER_RESOURCE_STATE_ON:
- seq_puts(seq, "on\n");
- break;
- case ACPI_POWER_RESOURCE_STATE_OFF:
- seq_puts(seq, "off\n");
- break;
- default:
- seq_puts(seq, "unknown\n");
- break;
- }
-
- mutex_lock(&resource->resource_lock);
- list_for_each_safe(node, next, &resource->reference) {
- ref = container_of(node, struct acpi_power_reference, node);
- count++;
- }
- mutex_unlock(&resource->resource_lock);
-
- seq_printf(seq, "system level: S%d\n"
- "order: %d\n"
- "reference count: %d\n",
- resource->system_level,
- resource->order, count);
-
- end:
- return 0;
-}
-
-static int acpi_power_open_fs(struct inode *inode, struct file *file)
-{
- return single_open(file, acpi_power_seq_show, PDE(inode)->data);
-}
-
-static int acpi_power_add_fs(struct acpi_device *device)
-{
- struct proc_dir_entry *entry = NULL;
-
-
- if (!device)
- return -EINVAL;
-
- if (!acpi_device_dir(device)) {
- acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
- acpi_power_dir);
- if (!acpi_device_dir(device))
- return -ENODEV;
- }
-
- /* 'status' [R] */
- entry = proc_create_data(ACPI_POWER_FILE_STATUS,
- S_IRUGO, acpi_device_dir(device),
- &acpi_power_fops, acpi_driver_data(device));
- if (!entry)
- return -EIO;
- return 0;
-}
-
-static int acpi_power_remove_fs(struct acpi_device *device)
-{
-
- if (acpi_device_dir(device)) {
- remove_proc_entry(ACPI_POWER_FILE_STATUS,
- acpi_device_dir(device));
- remove_proc_entry(acpi_device_bid(device), acpi_power_dir);
- acpi_device_dir(device) = NULL;
- }
-
- return 0;
-}
-
-/* --------------------------------------------------------------------------
Driver Interface
-------------------------------------------------------------------------- */
@@ -690,10 +583,6 @@ static int acpi_power_add(struct acpi_de
break;
}
- result = acpi_power_add_fs(device);
- if (result)
- goto end;
-
printk(KERN_INFO PREFIX "%s [%s] (%s)\n", acpi_device_name(device),
acpi_device_bid(device), state ? "on" : "off");
@@ -715,8 +604,6 @@ static int acpi_power_remove(struct acpi
resource = acpi_driver_data(device);
- acpi_power_remove_fs(device);
-
mutex_lock(&resource->resource_lock);
list_for_each_safe(node, next, &resource->reference) {
struct acpi_power_reference *ref = container_of(node, struct acpi_power_reference, node);
@@ -760,19 +647,6 @@ static int acpi_power_resume(struct acpi
int __init acpi_power_init(void)
{
- int result = 0;
-
INIT_LIST_HEAD(&acpi_power_resource_list);
-
- acpi_power_dir = proc_mkdir(ACPI_POWER_CLASS, acpi_root_dir);
- if (!acpi_power_dir)
- return -ENODEV;
-
- result = acpi_bus_register_driver(&acpi_power_driver);
- if (result < 0) {
- remove_proc_entry(ACPI_POWER_CLASS, acpi_root_dir);
- return -ENODEV;
- }
-
- return 0;
+ return acpi_bus_register_driver(&acpi_power_driver);
}
next reply other threads:[~2010-07-15 2:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-15 2:46 Zhang Rui [this message]
2010-08-15 4:28 ` [PATCH 6/9] ACPI power_resource: remove unused procfs I/F Len Brown
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=1279161999.4537.8519.camel@rzhang1-desktop \
--to=rui.zhang@intel.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox