public inbox for linux-acpi@vger.kernel.org
 help / color / mirror / Atom feed
From: Corentin CHARY <corentincj@iksaif.net>
To: lenb@kernel.org
Cc: linux-acpi@vger.kernel.org
Subject: [PATCH 4/4] asus-laptop version bump and lindent
Date: Sun, 6 May 2007 14:48:22 +0200	[thread overview]
Message-ID: <200705061448.22235.corentincj@iksaif.net> (raw)
In-Reply-To: <200705061445.03504.corentincj@iksaif.net>

From: Corentin Chary <corentincj@iksaif.net>

Version bump, lindent, etc ..

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
 asus-laptop.c |   29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

--- a/drivers/misc/asus-laptop.c	2007-05-05 09:33:12.000000000 +0200
+++ b/drivers/misc/asus-laptop.c	2007-05-05 09:33:32.000000000 +0200
@@ -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_LOG    ASUS_HOTK_FILE ": "
 #define ASUS_ERR    KERN_ERR    ASUS_LOG
@@ -149,7 +149,7 @@
 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 @@
 
 /* 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 @@
 	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 @@
 	/* 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 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 @@
 		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);
 }
 

  parent reply	other threads:[~2007-05-06 12:48 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-05-06 12:45 [PATCH 0/4] asus-laptop Corentin CHARY
2007-05-06 12:46 ` [PATCH 1/4] asus-laptop notify ALL events Corentin CHARY
2007-05-06 12:47 ` [PATCH 2/4] asus-laptop add GPS support Corentin CHARY
2007-05-06 12:47 ` [PATCH 3/4] asus-laptop fix light sens init Corentin CHARY
2007-05-06 12:48 ` Corentin CHARY [this message]
2007-05-07 10:00 ` [PATCH 0/4] asus-laptop Thomas Renninger
2007-05-10  6:44 ` 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=200705061448.22235.corentincj@iksaif.net \
    --to=corentincj@iksaif.net \
    --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