Re: [PATCH 5/9] ACPI EC: remove deprecated procfs I/F

[Alexey Starikovskiy <astarikovskiy@suse.de>]

16.07.2010 05:13, Zhang Rui пишет:
> On Thu, 2010-07-15 at 17:13 +0800, Alexey Starikovskiy wrote:
>> Hi Rui,
>>
>> Please add reporting of GLK use in dmesg, this is the only missing piece.
>>
> Okay, new patch attached.
Looks good,
Thanks,
Alex.
> 
> 
> Remove deprecated EC procfs I/F as all the info can be got in dmesg.
> 
> Acked-by: Alexey Starikovskiy <astarikovskiy@suse.de>
> Signed-off-by: Zhang Rui <rui.zhang@intel.com>
> ---
>  drivers/acpi/ec.c |   92 ++----------------------------------------------------
>  1 file changed, 5 insertions(+), 87 deletions(-)
> 
> Index: linux-2.6/drivers/acpi/ec.c
> ===================================================================
> --- linux-2.6.orig/drivers/acpi/ec.c
> +++ linux-2.6/drivers/acpi/ec.c
> @@ -34,8 +34,6 @@
>  #include <linux/init.h>
>  #include <linux/types.h>
>  #include <linux/delay.h>
> -#include <linux/proc_fs.h>
> -#include <linux/seq_file.h>
>  #include <linux/interrupt.h>
>  #include <linux/list.h>
>  #include <linux/spinlock.h>
> @@ -672,72 +670,6 @@ acpi_ec_space_handler(u32 function, acpi
>  }
>  
>  /* --------------------------------------------------------------------------
> -                              FS Interface (/proc)
> -   -------------------------------------------------------------------------- */
> -
> -static struct proc_dir_entry *acpi_ec_dir;
> -
> -static int acpi_ec_read_info(struct seq_file *seq, void *offset)
> -{
> -	struct acpi_ec *ec = seq->private;
> -
> -	if (!ec)
> -		goto end;
> -
> -	seq_printf(seq, "gpe:\t\t\t0x%02x\n", (u32) ec->gpe);
> -	seq_printf(seq, "ports:\t\t\t0x%02x, 0x%02x\n",
> -		   (unsigned)ec->command_addr, (unsigned)ec->data_addr);
> -	seq_printf(seq, "use global lock:\t%s\n",
> -		   ec->global_lock ? "yes" : "no");
> -      end:
> -	return 0;
> -}
> -
> -static int acpi_ec_info_open_fs(struct inode *inode, struct file *file)
> -{
> -	return single_open(file, acpi_ec_read_info, PDE(inode)->data);
> -}
> -
> -static const struct file_operations acpi_ec_info_ops = {
> -	.open = acpi_ec_info_open_fs,
> -	.read = seq_read,
> -	.llseek = seq_lseek,
> -	.release = single_release,
> -	.owner = THIS_MODULE,
> -};
> -
> -static int acpi_ec_add_fs(struct acpi_device *device)
> -{
> -	struct proc_dir_entry *entry = NULL;
> -
> -	if (!acpi_device_dir(device)) {
> -		acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
> -						     acpi_ec_dir);
> -		if (!acpi_device_dir(device))
> -			return -ENODEV;
> -	}
> -
> -	entry = proc_create_data(ACPI_EC_FILE_INFO, S_IRUGO,
> -				 acpi_device_dir(device),
> -				 &acpi_ec_info_ops, acpi_driver_data(device));
> -	if (!entry)
> -		return -ENODEV;
> -	return 0;
> -}
> -
> -static int acpi_ec_remove_fs(struct acpi_device *device)
> -{
> -
> -	if (acpi_device_dir(device)) {
> -		remove_proc_entry(ACPI_EC_FILE_INFO, acpi_device_dir(device));
> -		remove_proc_entry(acpi_device_bid(device), acpi_ec_dir);
> -		acpi_device_dir(device) = NULL;
> -	}
> -
> -	return 0;
> -}
> -
> -/* --------------------------------------------------------------------------
>                                 Driver Interface
>     -------------------------------------------------------------------------- */
>  static acpi_status
> @@ -887,9 +819,10 @@ static int acpi_ec_add(struct acpi_devic
>  	if (!first_ec)
>  		first_ec = ec;
>  	device->driver_data = ec;
> -	acpi_ec_add_fs(device);
> -	pr_info(PREFIX "GPE = 0x%lx, I/O: command/status = 0x%lx, data = 0x%lx\n",
> -			  ec->gpe, ec->command_addr, ec->data_addr);
> +	pr_info(PREFIX "GPE = 0x%lx, Global Lock: %s, "
> +		       "I/O: command/status = 0x%lx, data = 0x%lx",
> +		       ec->gpe, ec->global_lock ? "yes" : "no",
> +		       ec->command_addr, ec->data_addr);
>  
>  	ret = ec_install_handlers(ec);
>  
> @@ -914,7 +847,6 @@ static int acpi_ec_remove(struct acpi_de
>  		kfree(handler);
>  	}
>  	mutex_unlock(&ec->lock);
> -	acpi_ec_remove_fs(device);
>  	device->driver_data = NULL;
>  	if (ec == first_ec)
>  		first_ec = NULL;
> @@ -1093,20 +1025,8 @@ static struct acpi_driver acpi_ec_driver
>  
>  int __init acpi_ec_init(void)
>  {
> -	int result = 0;
> -
> -	acpi_ec_dir = proc_mkdir(ACPI_EC_CLASS, acpi_root_dir);
> -	if (!acpi_ec_dir)
> -		return -ENODEV;
> -
>  	/* Now register the driver for the EC */
> -	result = acpi_bus_register_driver(&acpi_ec_driver);
> -	if (result < 0) {
> -		remove_proc_entry(ACPI_EC_CLASS, acpi_root_dir);
> -		return -ENODEV;
> -	}
> -
> -	return result;
> +	return acpi_bus_register_driver(&acpi_ec_driver);
>  }
>  
>  /* EC driver currently not unloadable */
> @@ -1116,8 +1036,6 @@ static void __exit acpi_ec_exit(void)
>  
>  	acpi_bus_unregister_driver(&acpi_ec_driver);
>  
> -	remove_proc_entry(ACPI_EC_CLASS, acpi_root_dir);
> -
>  	return;
>  }
>  #endif	/* 0 */
> 
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html