Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f398532722b44aa797915d6b784e8694b277c2c7
Commit: f398532722b44aa797915d6b784e8694b277c2c7
Parent: 832d995029466e12aef66187bc9103487bf7be9f
Author: Corentin Chary [EMAIL PROTECTED]
AuthorDate: Sun May 6 14:48:22 2007 +0200
Committer: Len Brown [EMAIL PROTECTED]
CommitDate: Thu May 10 02:40:42 2007 -0400
asus-laptop: version bump and lindent
Version bump, lindent, etc ..
Signed-off-by: Corentin Chary [EMAIL PROTECTED]
Signed-off-by: Len Brown [EMAIL PROTECTED]
---
drivers/misc/asus-laptop.c | 29 +++--
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/drivers/misc/asus-laptop.c b/drivers/misc/asus-laptop.c
index b39419c..4f9060a 100644
--- a/drivers/misc/asus-laptop.c
+++ b/drivers/misc/asus-laptop.c
@@ -48,7 +48,7 @@
#include acpi/acpi_bus.h
#include asm/uaccess.h
-#define ASUS_LAPTOP_VERSION 0.41
+#define ASUS_LAPTOP_VERSION 0.42
#define ASUS_HOTK_NAME Asus Laptop Support
#define ASUS_HOTK_CLASS hotkey
@@ -83,7 +83,7 @@
#define PLED_ON 0x20 //Phone LED
#define GLED_ON 0x40 //Gaming LED
#define LCD_ON 0x80 //LCD backlight
-#define GPS_ON 0x100 //GPS
+#define GPS_ON 0x100 //GPS
#define ASUS_LOGASUS_HOTK_FILE :
#define ASUS_ERRKERN_ERRASUS_LOG
@@ -149,7 +149,7 @@ ASUS_HANDLE(display_set, ASUS_HOTK_PREFIX SDSP);
ASUS_HANDLE(display_get, \\_SB.PCI0.P0P1.VGA.GETD, /* A6B, A6K A6R A7D
F3JM L4R M6R A3G
M6A M6V VX-1 V6J V6V
W3Z */
\\_SB.PCI0.P0P2.VGA.GETD, /* A3E A4K, A4D A4L A6J A7J A8J Z71V M9V
- S5A M5A z33A W1Jc W2V */
+ S5A M5A z33A W1Jc W2V G1 */
\\_SB.PCI0.P0P3.VGA.GETD, /* A6V A6Q */
\\_SB.PCI0.P0PA.VGA.GETD, /* A6T, A6M */
\\_SB.PCI0.PCI1.VGAC.NMAP,/* L3C */
@@ -165,8 +165,8 @@ ASUS_HANDLE(ls_level, ASUS_HOTK_PREFIX ALSL); /* Z71A
Z71V */
/* GPS */
/* R2H use different handle for GPS on/off */
-ASUS_HANDLE(gps_on, ASUS_HOTK_PREFIX SDON); /* R2H */
-ASUS_HANDLE(gps_off, ASUS_HOTK_PREFIX SDOF); /* R2H */
+ASUS_HANDLE(gps_on, ASUS_HOTK_PREFIX SDON); /* R2H */
+ASUS_HANDLE(gps_off, ASUS_HOTK_PREFIX SDOF); /* R2H */
ASUS_HANDLE(gps_status, ASUS_HOTK_PREFIX GPST);
/*
@@ -285,17 +285,18 @@ static int read_wireless_status(int mask)
return (hotk-status mask) ? 1 : 0;
}
-static int read_gps_status(void) {
-ulong status;
+static int read_gps_status(void)
+{
+ ulong status;
acpi_status rv = AE_OK;
rv = acpi_evaluate_integer(gps_status_handle, NULL, NULL, status);
if (ACPI_FAILURE(rv))
-printk(ASUS_WARNING Error reading GPS status\n);
+ printk(ASUS_WARNING Error reading GPS status\n);
else
-return status ? 1 : 0;
+ return status ? 1 : 0;
-return (hotk-status GPS_ON) ? 1 : 0;
+ return (hotk-status GPS_ON) ? 1 : 0;
}
/* Generic LED functions */
@@ -304,8 +305,8 @@ static int read_status(int mask)
/* There is a special method for both wireless devices */
if (mask == BT_ON || mask == WL_ON)
return read_wireless_status(mask);
- else if(mask == GPS_ON)
-return read_gps_status();
+ else if (mask == GPS_ON)
+ return read_gps_status();
return (hotk-status mask) ? 1 : 0;
}
@@ -705,7 +706,7 @@ static ssize_t show_gps(struct device *dev,
static ssize_t store_gps(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
-return store_status(buf, count, NULL, GPS_ON);
+ return store_status(buf, count, NULL, GPS_ON);
}
static void asus_hotk_notify(acpi_handle handle, u32 event, void *data)
@@ -807,7 +808,7 @@ static void asus_hotk_add_fs(void)
ASUS_SET_DEVICE_ATTR(ls_switch, 0644, show_lssw, store_lssw);
}
- if(gps_status_handle gps_on_handle gps_off_handle)
+ if (gps_status_handle gps_on_handle gps_off_handle)
ASUS_SET_DEVICE_ATTR(gps, 0644, show_gps, store_gps);
}
-
To unsubscribe from this list: send the line unsubscribe git-commits-head in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
