mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
ACPI: thinkpad-acpi: cleanup after rename
Cleanup documentation, driver strings and other misc stuff, now that the driver is named "thinkpad-acpi". Signed-off-by: Henrique de Moraes Holschuh <[email protected]> Signed-off-by: Len Brown <[email protected]>
This commit is contained in:
parent
d903ac5455
commit
643f12dbb6
3 changed files with 49 additions and 36 deletions
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* ibm_acpi.c - IBM ThinkPad ACPI Extras
|
||||
* thinkpad_acpi.c - ThinkPad ACPI Extras
|
||||
*
|
||||
*
|
||||
* Copyright (C) 2004-2005 Borislav Deianov <borislav@users.sf.net>
|
||||
|
|
@ -21,10 +21,12 @@
|
|||
* 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#define IBM_VERSION "0.13"
|
||||
#define IBM_VERSION "0.14"
|
||||
|
||||
/*
|
||||
* Changelog:
|
||||
* 2007-03-27 0.14 renamed to thinkpad_acpi and moved to
|
||||
* drivers/misc.
|
||||
*
|
||||
* 2006-11-22 0.13 new maintainer
|
||||
* changelog now lives in git commit history, and will
|
||||
|
|
@ -318,7 +320,9 @@ static int __init setup_notify(struct ibm_struct *ibm)
|
|||
}
|
||||
|
||||
acpi_driver_data(ibm->device) = ibm;
|
||||
sprintf(acpi_device_class(ibm->device), "%s/%s", IBM_NAME, ibm->name);
|
||||
sprintf(acpi_device_class(ibm->device), "%s/%s",
|
||||
IBM_ACPI_EVENT_PREFIX,
|
||||
ibm->name);
|
||||
|
||||
status = acpi_install_notify_handler(*ibm->handle, ibm->type,
|
||||
dispatch_notify, ibm);
|
||||
|
|
@ -458,7 +462,7 @@ static char *next_cmd(char **cmds)
|
|||
* ibm-acpi init subdriver
|
||||
*/
|
||||
|
||||
static int ibm_acpi_driver_init(void)
|
||||
static int thinkpad_acpi_driver_init(void)
|
||||
{
|
||||
printk(IBM_INFO "%s v%s\n", IBM_DESC, IBM_VERSION);
|
||||
printk(IBM_INFO "%s\n", IBM_URL);
|
||||
|
|
@ -470,7 +474,7 @@ static int ibm_acpi_driver_init(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int ibm_acpi_driver_read(char *p)
|
||||
static int thinkpad_acpi_driver_read(char *p)
|
||||
{
|
||||
int len = 0;
|
||||
|
||||
|
|
@ -2440,8 +2444,8 @@ static struct proc_dir_entry *proc_dir = NULL;
|
|||
static struct ibm_struct ibms[] = {
|
||||
{
|
||||
.name = "driver",
|
||||
.init = ibm_acpi_driver_init,
|
||||
.read = ibm_acpi_driver_read,
|
||||
.init = thinkpad_acpi_driver_init,
|
||||
.read = thinkpad_acpi_driver_read,
|
||||
},
|
||||
{
|
||||
.name = "hotkey",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* ibm_acpi.h - IBM ThinkPad ACPI Extras
|
||||
* thinkpad_acpi.h - ThinkPad ACPI Extras
|
||||
*
|
||||
*
|
||||
* Copyright (C) 2004-2005 Borislav Deianov <borislav@users.sf.net>
|
||||
|
|
@ -21,8 +21,8 @@
|
|||
* 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#ifndef __IBM_ACPI_H__
|
||||
#define __IBM_ACPI_H__
|
||||
#ifndef __THINKPAD_ACPI_H__
|
||||
#define __THINKPAD_ACPI_H__
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/module.h>
|
||||
|
|
@ -47,12 +47,13 @@
|
|||
* Main driver
|
||||
*/
|
||||
|
||||
#define IBM_NAME "ibm"
|
||||
#define IBM_DESC "IBM ThinkPad ACPI Extras"
|
||||
#define IBM_FILE "ibm_acpi"
|
||||
#define IBM_NAME "thinkpad"
|
||||
#define IBM_DESC "ThinkPad ACPI Extras"
|
||||
#define IBM_FILE "thinkpad_acpi"
|
||||
#define IBM_URL "http://ibm-acpi.sf.net/"
|
||||
|
||||
#define IBM_DIR IBM_NAME
|
||||
#define IBM_DIR "ibm"
|
||||
#define IBM_ACPI_EVENT_PREFIX "ibm"
|
||||
|
||||
#define IBM_LOG IBM_FILE ": "
|
||||
#define IBM_ERR KERN_ERR IBM_LOG
|
||||
|
|
@ -99,8 +100,8 @@ static void ibm_handle_init(char *name,
|
|||
|
||||
/* procfs support */
|
||||
static struct proc_dir_entry *proc_dir;
|
||||
static int ibm_acpi_driver_init(void);
|
||||
static int ibm_acpi_driver_read(char *p);
|
||||
static int thinkpad_acpi_driver_init(void);
|
||||
static int thinkpad_acpi_driver_read(char *p);
|
||||
|
||||
/* procfs helpers */
|
||||
static int dispatch_read(char *page, char **start, off_t off, int count,
|
||||
|
|
@ -434,4 +435,4 @@ static int wan_read(char *p);
|
|||
static int wan_write(char *buf);
|
||||
|
||||
|
||||
#endif /* __IBM_ACPI_H */
|
||||
#endif /* __THINKPAD_ACPI_H */
|
||||
|
|
|
|||
Loading…
Reference in a new issue