All of lore.kernel.org
 help / color / mirror / Atom feed
From: Len Brown <lenb@kernel.org>
To: linux-acpi@vger.kernel.org
Cc: Len Brown <len.brown@intel.com>
Subject: [PATCH 16/41] sony-laptop: Lindent
Date: Tue, 13 Feb 2007 00:49:18 -0500	[thread overview]
Message-ID: <11713458052158-git-send-email-lenb@kernel.org> (raw)
Message-ID: <652cc3bf92fd9727ad55fb9405b870ba44a6788e.1171345630.git.len.brown@intel.com> (raw)
In-Reply-To: <11713458041996-git-send-email-lenb@kernel.org>
In-Reply-To: <268d175f131e33fe1aed4cd5080884ab5d0badb2.1171345630.git.len.brown@intel.com>

From: Len Brown <len.brown@intel.com>

Signed-off-by: Len Brown <len.brown@intel.com>
---
 drivers/misc/sony-laptop.c |  151 +++++++++++++++++++++++---------------------
 1 files changed, 78 insertions(+), 73 deletions(-)

diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index 4a69ce7..d7b5330 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -52,21 +52,23 @@ MODULE_LICENSE("GPL");
 static int debug;
 module_param(debug, int, 0);
 MODULE_PARM_DESC(debug, "set this to 1 (and RTFM) if you want to help "
-			"the development of this driver");
+		 "the development of this driver");
 
-static ssize_t sony_acpi_show(struct device *, struct device_attribute *, char *);
-static ssize_t sony_acpi_store(struct device *, struct device_attribute *, const char *, size_t);
+static ssize_t sony_acpi_show(struct device *, struct device_attribute *,
+			      char *);
+static ssize_t sony_acpi_store(struct device *, struct device_attribute *,
+			       const char *, size_t);
 
 struct sony_acpi_value {
-	char			*name;		/* name of the entry */
-	char			**acpiget;	/* names of the ACPI get function */
-	char			**acpiset;	/* names of the ACPI set function */
-	int 			min;		/* minimum allowed value or -1 */
-	int			max;		/* maximum allowed value or -1 */
-	int			value;		/* current setting */
-	int			valid;		/* Has ever been set */
-	int			debug;		/* active only in debug mode ? */
-	struct device_attribute	devattr;	/* sysfs atribute */
+	char *name;		/* name of the entry */
+	char **acpiget;		/* names of the ACPI get function */
+	char **acpiset;		/* names of the ACPI set function */
+	int min;		/* minimum allowed value or -1 */
+	int max;		/* maximum allowed value or -1 */
+	int value;		/* current setting */
+	int valid;		/* Has ever been set */
+	int debug;		/* active only in debug mode ? */
+	struct device_attribute devattr;	/* sysfs atribute */
 };
 
 #define HANDLE_NAMES(_name, _values...) \
@@ -111,16 +113,18 @@ HANDLE_NAMES(CMI_get, "GCMI");
 HANDLE_NAMES(CMI_set, "SCMI");
 
 static struct sony_acpi_value sony_acpi_values[] = {
-	SONY_ACPI_VALUE(brightness_default, snc_brightness_def_get, snc_brightness_def_set, 1, SONY_MAX_BRIGHTNESS, 0),
-	SONY_ACPI_VALUE(fnkey,		snc_fnkey_get, NULL, -1, -1, 0),
-	SONY_ACPI_VALUE(cdpower,	snc_cdpower_get, snc_cdpower_set, 0, 1, 0),
-	SONY_ACPI_VALUE(audiopower,	snc_audiopower_get, snc_audiopower_set, 0, 1, 0),
-	SONY_ACPI_VALUE(lanpower,	snc_lanpower_get, snc_lanpower_set, 0, 1, 1),
+	SONY_ACPI_VALUE(brightness_default, snc_brightness_def_get,
+			snc_brightness_def_set, 1, SONY_MAX_BRIGHTNESS, 0),
+	SONY_ACPI_VALUE(fnkey, snc_fnkey_get, NULL, -1, -1, 0),
+	SONY_ACPI_VALUE(cdpower, snc_cdpower_get, snc_cdpower_set, 0, 1, 0),
+	SONY_ACPI_VALUE(audiopower, snc_audiopower_get, snc_audiopower_set, 0,
+			1, 0),
+	SONY_ACPI_VALUE(lanpower, snc_lanpower_get, snc_lanpower_set, 0, 1, 1),
 	/* unknown methods */
-	SONY_ACPI_VALUE(PID,		snc_PID_get, NULL, -1, -1, 1),
-	SONY_ACPI_VALUE(CTR,		snc_CTR_get, snc_CTR_set, -1, -1, 1),
-	SONY_ACPI_VALUE(PCR,		snc_PCR_get, snc_PCR_set, -1, -1, 1),
-	SONY_ACPI_VALUE(CMI,		snc_CMI_get, snc_CMI_set, -1, -1, 1),
+	SONY_ACPI_VALUE(PID, snc_PID_get, NULL, -1, -1, 1),
+	SONY_ACPI_VALUE(CTR, snc_CTR_get, snc_CTR_set, -1, -1, 1),
+	SONY_ACPI_VALUE(PCR, snc_PCR_get, snc_PCR_set, -1, -1, 1),
+	SONY_ACPI_VALUE(CMI, snc_CMI_get, snc_CMI_set, -1, -1, 1),
 	SONY_ACPI_VALUE_NULL
 };
 
@@ -189,10 +193,11 @@ static int acpi_callsetfunc(acpi_handle handle, char *name, int value,
  * Sysfs show/store common to all sony_acpi_values
  */
 static ssize_t sony_acpi_show(struct device *dev, struct device_attribute *attr,
-		char *buffer)
+			      char *buffer)
 {
 	int value;
-	struct sony_acpi_value *item = container_of(attr, struct sony_acpi_value, devattr);
+	struct sony_acpi_value *item =
+	    container_of(attr, struct sony_acpi_value, devattr);
 
 	if (!*item->acpiget)
 		return -EIO;
@@ -203,11 +208,13 @@ static ssize_t sony_acpi_show(struct device *dev, struct device_attribute *attr,
 	return snprintf(buffer, PAGE_SIZE, "%d\n", value);
 }
 
-static ssize_t sony_acpi_store(struct device *dev, struct device_attribute *attr,
-		const char *buffer, size_t count)
+static ssize_t sony_acpi_store(struct device *dev,
+			       struct device_attribute *attr,
+			       const char *buffer, size_t count)
 {
 	int value;
-	struct sony_acpi_value *item = container_of(attr, struct sony_acpi_value, devattr);
+	struct sony_acpi_value *item =
+	    container_of(attr, struct sony_acpi_value, devattr);
 
 	if (!item->acpiset)
 		return -EIO;
@@ -234,9 +241,9 @@ static ssize_t sony_acpi_store(struct device *dev, struct device_attribute *attr
  */
 static struct platform_driver sncpf_driver = {
 	.driver = {
-		.name = "sony-laptop",
-		.owner = THIS_MODULE,
-	}
+		   .name = "sony-laptop",
+		   .owner = THIS_MODULE,
+		   }
 };
 static struct platform_device *sncpf_device;
 
@@ -268,12 +275,11 @@ static int sony_snc_pf_add(void)
 		/* find the available acpiget as described in the DSDT */
 		for (; item->acpiget && *item->acpiget; ++item->acpiget) {
 			if (ACPI_SUCCESS(acpi_get_handle(sony_acpi_handle,
-							*item->acpiget,
-							&handle))) {
+							 *item->acpiget,
+							 &handle))) {
 				if (debug)
 					printk(LOG_PFX "Found %s getter: %s\n",
-							item->name,
-							*item->acpiget);
+					       item->name, *item->acpiget);
 				item->devattr.attr.mode |= S_IRUGO;
 				break;
 			}
@@ -282,36 +288,37 @@ static int sony_snc_pf_add(void)
 		/* find the available acpiset as described in the DSDT */
 		for (; item->acpiset && *item->acpiset; ++item->acpiset) {
 			if (ACPI_SUCCESS(acpi_get_handle(sony_acpi_handle,
-							*item->acpiset,
-							&handle))) {
+							 *item->acpiset,
+							 &handle))) {
 				if (debug)
 					printk(LOG_PFX "Found %s setter: %s\n",
-							item->name,
-							*item->acpiset);
+					       item->name, *item->acpiset);
 				item->devattr.attr.mode |= S_IWUSR;
 				break;
 			}
 		}
 
-	       if (item->devattr.attr.mode != 0) {
-		       ret = device_create_file(&sncpf_device->dev, &item->devattr);
-		       if (ret)
-			       goto out_sysfs;
-	       }
+		if (item->devattr.attr.mode != 0) {
+			ret =
+			    device_create_file(&sncpf_device->dev,
+					       &item->devattr);
+			if (ret)
+				goto out_sysfs;
+		}
 	}
 
 	return 0;
 
-out_sysfs:
+      out_sysfs:
 	for (item = sony_acpi_values; item->name; ++item) {
 		device_remove_file(&sncpf_device->dev, &item->devattr);
 	}
 	platform_device_del(sncpf_device);
-out_platform_alloced:
+      out_platform_alloced:
 	platform_device_put(sncpf_device);
-out_platform_registered:
+      out_platform_registered:
 	platform_driver_unregister(&sncpf_driver);
-out:
+      out:
 	return ret;
 }
 
@@ -334,8 +341,7 @@ static void sony_snc_pf_remove(void)
 static int sony_backlight_update_status(struct backlight_device *bd)
 {
 	return acpi_callsetfunc(sony_acpi_handle, "SBRT",
-				bd->props->brightness + 1,
-				NULL);
+				bd->props->brightness + 1, NULL);
 }
 
 static int sony_backlight_get_brightness(struct backlight_device *bd)
@@ -350,10 +356,10 @@ static int sony_backlight_get_brightness(struct backlight_device *bd)
 
 static struct backlight_device *sony_backlight_device;
 static struct backlight_properties sony_backlight_properties = {
-	.owner		= THIS_MODULE,
-	.update_status	= sony_backlight_update_status,
-	.get_brightness	= sony_backlight_get_brightness,
-	.max_brightness	= SONY_MAX_BRIGHTNESS - 1,
+	.owner = THIS_MODULE,
+	.update_status = sony_backlight_update_status,
+	.get_brightness = sony_backlight_get_brightness,
+	.max_brightness = SONY_MAX_BRIGHTNESS - 1,
 };
 
 /*
@@ -372,8 +378,8 @@ static acpi_status sony_walk_callback(acpi_handle handle, u32 level,
 	struct acpi_namespace_node *node;
 	union acpi_operand_object *operand;
 
-	node = (struct acpi_namespace_node *) handle;
-	operand = (union acpi_operand_object *) node->object;
+	node = (struct acpi_namespace_node *)handle;
+	operand = (union acpi_operand_object *)node->object;
 
 	printk(LOG_PFX "method: name: %4.4s, args %X\n", node->name.ascii,
 	       (u32) operand->method.param_count);
@@ -394,7 +400,7 @@ static int sony_acpi_resume(struct acpi_device *device)
 		if (!item->valid)
 			continue;
 		ret = acpi_callsetfunc(sony_acpi_handle, *item->acpiset,
-					item->value, NULL);
+				       item->value, NULL);
 		if (ret < 0) {
 			printk("%s: %d\n", __FUNCTION__, ret);
 			break;
@@ -425,8 +431,7 @@ static int sony_acpi_add(struct acpi_device *device)
 
 	status = acpi_install_notify_handler(sony_acpi_handle,
 					     ACPI_DEVICE_NOTIFY,
-					     sony_acpi_notify,
-					     NULL);
+					     sony_acpi_notify, NULL);
 	if (ACPI_FAILURE(status)) {
 		printk(LOG_PFX "unable to install notify handler\n");
 		result = -ENODEV;
@@ -435,15 +440,16 @@ static int sony_acpi_add(struct acpi_device *device)
 
 	if (ACPI_SUCCESS(acpi_get_handle(sony_acpi_handle, "GBRT", &handle))) {
 		sony_backlight_device = backlight_device_register("sony", NULL,
-					NULL, &sony_backlight_properties);
+								  NULL,
+								  &sony_backlight_properties);
 
-	        if (IS_ERR(sony_backlight_device)) {
+		if (IS_ERR(sony_backlight_device)) {
 			printk(LOG_PFX "unable to register backlight device\n");
 			sony_backlight_device = NULL;
-		}
-		else
+		} else
 			sony_backlight_properties.brightness =
-				sony_backlight_get_brightness(sony_backlight_device);
+			    sony_backlight_get_brightness
+			    (sony_backlight_device);
 	}
 
 	if (sony_snc_pf_add())
@@ -453,7 +459,7 @@ static int sony_acpi_add(struct acpi_device *device)
 
 	return 0;
 
-outbacklight:
+      outbacklight:
 	if (sony_backlight_device)
 		backlight_device_unregister(sony_backlight_device);
 
@@ -462,7 +468,7 @@ outbacklight:
 					    sony_acpi_notify);
 	if (ACPI_FAILURE(status))
 		printk(LOG_PFX "unable to remove notify handler\n");
-outwalk:
+      outwalk:
 	return result;
 }
 
@@ -489,14 +495,14 @@ static int sony_acpi_remove(struct acpi_device *device, int type)
 }
 
 static struct acpi_driver sony_acpi_driver = {
-	.name	= ACPI_SNC_DRIVER_NAME,
-	.class	= ACPI_SNC_CLASS,
-	.ids	= ACPI_SNC_HID,
-	.ops	= {
-			.add	= sony_acpi_add,
-			.remove	= sony_acpi_remove,
-			.resume = sony_acpi_resume,
-		  },
+	.name = ACPI_SNC_DRIVER_NAME,
+	.class = ACPI_SNC_CLASS,
+	.ids = ACPI_SNC_HID,
+	.ops = {
+		.add = sony_acpi_add,
+		.remove = sony_acpi_remove,
+		.resume = sony_acpi_resume,
+		},
 };
 
 static int __init sony_acpi_init(void)
@@ -504,7 +510,6 @@ static int __init sony_acpi_init(void)
 	return acpi_bus_register_driver(&sony_acpi_driver);
 }
 
-
 static void __exit sony_acpi_exit(void)
 {
 	acpi_bus_unregister_driver(&sony_acpi_driver);
-- 
1.5.0.rc4.345.gb4d2

  parent reply	other threads:[~2007-02-13  5:50 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-02-13  5:49 ACPI related patches for 2.6.21 -- part II Len Brown
2007-02-13  5:49 ` [PATCH 01/41] sony_acpi: SNC device support for Sony Vaios Len Brown
2007-02-13  5:49   ` Len Brown
2007-02-13  5:49   ` [PATCH 02/41] sony_acpi: Avoid dimness on resume Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49   ` [PATCH 03/41] sony_acpi: Fix sony_acpi_resume call Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49   ` [PATCH 04/41] sony_acpi: Add backlight support to the sony_acpi Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49   ` [PATCH 05/41] sony_acpi: Add backlight support to the sony_acpi v2 Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49   ` [PATCH 06/41] sony_acpi: Video sysfs support take 2 Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49   ` [PATCH 07/41] sony_acpi: Add acpi_bus_generate event Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49   ` [PATCH 08/41] sony_acpi: Allow easier debugging for the unknown SNC methods Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49   ` [PATCH 09/41] sony_acpi: Add lanpower and audiopower controls Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49   ` [PATCH 10/41] sony_acpi: Allow multiple sony_acpi_values for the same .name Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49   ` [PATCH 11/41] sony_acpi: Fix sony_acpi backlight registration and unregistration Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49   ` [PATCH 12/41] sony-laptop: create from sony_acpi Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49   ` [PATCH 13/41] sony-laptop: Remove /proc/acpi/sony interface and implement platform_device Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49   ` [PATCH 14/41] sony-laptop: Small update to the Kconfig help to make people believe this driver is useful Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49   ` [PATCH 15/41] sony-laptop: Group functions and structures to better draw subsytems usage Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49   ` Len Brown [this message]
2007-02-13  5:49     ` [PATCH 16/41] sony-laptop: Lindent Len Brown
2007-02-13  5:49   ` [PATCH 17/41] ACPI: bay: remove ACPI driver struct Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49   ` [PATCH 18/41] ACPI: asus_acpi: Add support for Asus Z81SP Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49       ` [PATCH 19/41] ACPI: updates rtc-cmos device platform_data Len Brown
2007-02-13  5:49         ` Len Brown
2007-02-13  5:49   ` [PATCH 20/41] ACPI: bay: fix build warning Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49   ` [PATCH 22/41] sony-laptop: Update docs Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49   ` [PATCH 23/41] sony-laptop: add to MAINTAINERS Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49   ` [PATCH 24/41] ACPI: bay: fix wrong order of kzalloc arguments Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49   ` [PATCH 25/41] ACPI: ibm-acpi: cleanup init and exit paths Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49   ` [PATCH 26/41] ACPI: video: Fix null pointer in appledisplay driver Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  6:53       ` Len Brown
2007-02-13  5:49   ` [PATCH 27/41] ACPI: hotkey: remove driver, per feature-removal-schedule.txt Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49   ` [PATCH 28/41] ACPI: Disable GPEs in preparation for sleep Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49   ` [PATCH 29/41] ACPI: invoke acpi_sleep_init() earlier Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49   ` [PATCH 30/41] ACPI: battery: check for battery present on /proc/battery access Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49   ` [PATCH 31/41] ACPI: sbs: fix present rate Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49   ` [PATCH 32/41] ACPI: add video driver MAINTAINER Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49   ` [PATCH 33/41] ACPI: acpi_table_parse() now returns success/fail, not count Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49   ` [PATCH 34/41] ACPI: acpi_madt_entry_handler() is not MADT specific Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49   ` [PATCH 35/41] ACPI: acpi_table_parse_madt_family() " Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49   ` [PATCH 36/41] ACPI: IA64: fix calculation of apic_id Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49   ` [PATCH 37/41] ACPI: clean up ACPI_MODULE_NAME() use Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49       ` [PATCH 38/41] ACPI: fix acpi_driver.name usage Len Brown
2007-02-13  5:49         ` Len Brown
2007-02-13  5:49   ` [PATCH 39/41] ACPI: delete extra #defines in /drivers/acpi/ drivers Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49   ` [PATCH 40/41] sony-laptop: allow complex per-value input/output validation Len Brown
2007-02-13  5:49     ` Len Brown
2007-02-13  5:49   ` [PATCH 41/41] ACPI: cleanup: make disable_acpi() valid w/o CONFIG_ACPI Len Brown
2007-02-13  5:49     ` 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=11713458052158-git-send-email-lenb@kernel.org \
    --to=lenb@kernel.org \
    --cc=len.brown@intel.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.