patch-2.4.10 linux/drivers/acpi/ospm/ac_adapter/ac_osl.c

• Lines: 113
• Date: Sun Sep 23 09:42:32 2001
• Orig file: v2.4.9/linux/drivers/acpi/ospm/ac_adapter/ac_osl.c
• Orig date: Tue Jul 3 17:08:19 2001

diff -u --recursive --new-file v2.4.9/linux/drivers/acpi/ospm/ac_adapter/ac_osl.c linux/drivers/acpi/ospm/ac_adapter/ac_osl.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  *
  * Module Name: ac_osl.c
- *   $Revision: 7 $
+ *   $Revision: 9 $
  *
  *****************************************************************************/
 
@@ -35,6 +35,7 @@
 
 MODULE_AUTHOR("Andrew Grover");
 MODULE_DESCRIPTION("ACPI Component Architecture (CA) - AC Adapter Driver");
+MODULE_LICENSE("GPL");
 
 
 #define AC_PROC_ROOT		"ac_adapter"
@@ -61,7 +62,7 @@
 	int 			*eof,
 	void			*context)
 {
-	ACPI_STATUS 		status = AE_OK;
+	acpi_status 		status = AE_OK;
 	AC_CONTEXT		*ac_adapter = NULL;
 	char			*p = page;
 	int			len;
@@ -85,11 +86,11 @@
 	}
 
 	if (ac_adapter->is_online) {
-		p += sprintf(p, "Status:                  %s\n", 
+		p += sprintf(p, "Status:                  %s\n",
 			AC_ON_LINE);
 	}
 	else {
-		p += sprintf(p, "Status:                  %s\n", 
+		p += sprintf(p, "Status:                  %s\n",
 			AC_OFF_LINE);
 	}
 
@@ -111,7 +112,7 @@
  *
  ****************************************************************************/
 
-ACPI_STATUS
+acpi_status
 ac_osl_add_device(
 	AC_CONTEXT		*ac_adapter)
 {
@@ -128,7 +129,7 @@
 		return(AE_ERROR);
 	}
 
-	create_proc_read_entry(AC_PROC_STATUS, S_IFREG | S_IRUGO, 
+	create_proc_read_entry(AC_PROC_STATUS, S_IFREG | S_IRUGO,
 		proc_entry, ac_osl_proc_read_status, (void*)ac_adapter);
 
 	return(AE_OK);
@@ -141,7 +142,7 @@
  *
  ****************************************************************************/
 
-ACPI_STATUS
+acpi_status
 ac_osl_remove_device (
 	AC_CONTEXT		*ac_adapter)
 {
@@ -167,12 +168,12 @@
  *
  ****************************************************************************/
 
-ACPI_STATUS
+acpi_status
 ac_osl_generate_event (
 	u32			event,
 	AC_CONTEXT		*ac_adapter)
 {
-	ACPI_STATUS		status = AE_OK;
+	acpi_status		status = AE_OK;
 
 	if (!ac_adapter) {
 		return(AE_BAD_PARAMETER);
@@ -181,7 +182,7 @@
 	switch (event) {
 
 	case AC_NOTIFY_STATUS_CHANGE:
-		status = bm_osl_generate_event(ac_adapter->device_handle, 
+		status = bm_osl_generate_event(ac_adapter->device_handle,
 			AC_PROC_ROOT, ac_adapter->uid, event, 0);
 		break;
 
@@ -206,10 +207,10 @@
  *
  ****************************************************************************/
 
-static int __init 
+static int __init
 ac_osl_init (void)
 {
-	ACPI_STATUS		status = AE_OK;
+	acpi_status		status = AE_OK;
 
 	ac_proc_root = proc_mkdir(AC_PROC_ROOT, bm_proc_root);
 	if (!ac_proc_root) {
@@ -239,7 +240,7 @@
  *
  ****************************************************************************/
 
-static void __exit 
+static void __exit
 ac_osl_cleanup (void)
 {
 	ac_terminate();