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
next prev 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
[not found] ` <268d175f131e33fe1aed4cd5080884ab5d0badb2.1171345630.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 01/41] sony_acpi: SNC device support for Sony Vaios Len Brown
[not found] ` <ab17c4e535a71a336b9647f0f87fb336c7da2a4f.1171345630.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 02/41] sony_acpi: Avoid dimness on resume Len Brown
[not found] ` <2c06db8eba9efbb4e2d8e5bbddbb3ef84f4976b7.1171345630.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 03/41] sony_acpi: Fix sony_acpi_resume call Len Brown
[not found] ` <8b9348df366378a332a33caeedfb7cf4056b82e0.1171345630.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 04/41] sony_acpi: Add backlight support to the sony_acpi Len Brown
[not found] ` <9e73ddf5a1d443f31d2397a4d09a24788892716f.1171345630.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 05/41] sony_acpi: Add backlight support to the sony_acpi v2 Len Brown
[not found] ` <95e3512ecb64af5b28facb75c75979c328ef248f.1171345630.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 06/41] sony_acpi: Video sysfs support take 2 Len Brown
[not found] ` <003d185e7123e92f56f4a889015419c272f29fa9.1171345630.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 07/41] sony_acpi: Add acpi_bus_generate event Len Brown
[not found] ` <3dc86780b4c99fbed04c64279035c32c697863a3.1171345630.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 08/41] sony_acpi: Allow easier debugging for the unknown SNC methods Len Brown
[not found] ` <a510bc55cb997353d4dbdbb9632ecb71ac4d2f98.1171345630.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 09/41] sony_acpi: Add lanpower and audiopower controls Len Brown
[not found] ` <da375c9066d5c17bb8c52350c5a13b9c80ddf29d.1171345630.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 10/41] sony_acpi: Allow multiple sony_acpi_values for the same .name Len Brown
[not found] ` <3dca7036d37f32f7fce018cea5eb487edd6b2c24.1171345630.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 11/41] sony_acpi: Fix sony_acpi backlight registration and unregistration Len Brown
[not found] ` <0c3be8460c60c90cf9c43bc7c5f0e1ef7092ab0a.1171345630.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 12/41] sony-laptop: create from sony_acpi Len Brown
[not found] ` <cb7bf16614cb3ab597c56a77c0e67f852c1fb82c.1171345630.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 13/41] sony-laptop: Remove /proc/acpi/sony interface and implement platform_device Len Brown
[not found] ` <e94975adbc53d65bc0362f8eec5f77bea7c88425.1171345630.git.len.brown@intel.com>
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
[not found] ` <fb4d31866a03a81b184eebafb8fea605f2808fe5.1171345630.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 15/41] sony-laptop: Group functions and structures to better draw subsytems usage Len Brown
[not found] ` <652cc3bf92fd9727ad55fb9405b870ba44a6788e.1171345630.git.len.brown@intel.com>
2007-02-13 5:49 ` Len Brown [this message]
[not found] ` <c41458aca0defd5b16239ffd65630d1b87672ee5.1171345630.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 17/41] ACPI: bay: remove ACPI driver struct Len Brown
[not found] ` <1c0f0575fd02a3996f09cac2ef29c4cc5c2d279d.1171345630.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 18/41] ACPI: asus_acpi: Add support for Asus Z81SP Len Brown
[not found] ` <a74388e21ef2adbba4450f7b3f05ffe88df630d5.1171345630.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 19/41] ACPI: updates rtc-cmos device platform_data Len Brown
[not found] ` <d94d3dff0d5da3bdfcbb424ba5c08534521fd690.1171345630.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 20/41] ACPI: bay: fix build warning Len Brown
[not found] ` <69bd3589ca7240c0ff16a0d1192c233bee144800.1171345630.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 22/41] sony-laptop: Update docs Len Brown
[not found] ` <7e20729c3b890b8d9de110093cd543bece659a50.1171345630.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 23/41] sony-laptop: add to MAINTAINERS Len Brown
[not found] ` <a3c94e5c5921b0fd75b33042ca598aee52f1f7b9.1171345630.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 24/41] ACPI: bay: fix wrong order of kzalloc arguments Len Brown
[not found] ` <3945ac36af3da6014cde9836c5acc5b3adaaa379.1171345630.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 25/41] ACPI: ibm-acpi: cleanup init and exit paths Len Brown
[not found] ` <d78112e1f1da2a8be1ac0d7b583dcc25aa4f079c.1171345630.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 26/41] ACPI: video: Fix null pointer in appledisplay driver Len Brown
2007-02-13 6:53 ` Len Brown
[not found] ` <2c95494ca0c21ed4784b15f78d09ab59ef08baa4.1171345630.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 27/41] ACPI: hotkey: remove driver, per feature-removal-schedule.txt Len Brown
[not found] ` <ed41dab90eb40ac4911e60406bc653661f0e4ce1.1171345631.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 28/41] ACPI: Disable GPEs in preparation for sleep Len Brown
[not found] ` <aafbcd165a2a02e6dff173f66772b3148229ace8.1171345631.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 29/41] ACPI: invoke acpi_sleep_init() earlier Len Brown
[not found] ` <4bd35cdb1e2d1a1bbbe4b75132718e79b80519ab.1171345631.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 30/41] ACPI: battery: check for battery present on /proc/battery access Len Brown
[not found] ` <e6d0f5622d30a3b98fb0ba6264d5006a18270890.1171345631.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 31/41] ACPI: sbs: fix present rate Len Brown
[not found] ` <359acec8cd78d35e64147565e28b516599066e08.1171345631.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 32/41] ACPI: add video driver MAINTAINER Len Brown
[not found] ` <f7bbbd219905be041293cd769c6a242d1792d79c.1171345631.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 33/41] ACPI: acpi_table_parse() now returns success/fail, not count Len Brown
[not found] ` <87eca7b63a8090b0fa701afcb7eeb0786e4d27e7.1171345631.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 34/41] ACPI: acpi_madt_entry_handler() is not MADT specific Len Brown
[not found] ` <efc1b941936bb4b211bdba45616196efbd186fa7.1171345631.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 35/41] ACPI: acpi_table_parse_madt_family() " Len Brown
[not found] ` <615d5f235b6c402ca01098a828c3d67e79e57cb6.1171345631.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 36/41] ACPI: IA64: fix calculation of apic_id Len Brown
[not found] ` <f52fd66d2ea794010c2d7536cf8e6abed0ac4947.1171345631.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 37/41] ACPI: clean up ACPI_MODULE_NAME() use Len Brown
[not found] ` <c2b6705b75d9c7aff98a4602a32230639e10891c.1171345631.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 38/41] ACPI: fix acpi_driver.name usage Len Brown
[not found] ` <7cda93e008e1a477970adbf82dba81a5d4f0ae40.1171345631.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 39/41] ACPI: delete extra #defines in /drivers/acpi/ drivers Len Brown
[not found] ` <2136aff6886eebac074811cecb59f5c60642e70a.1171345631.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 40/41] sony-laptop: allow complex per-value input/output validation Len Brown
[not found] ` <a795ca5852fb944f21bd71c1230fcc5456e7d5ef.1171345631.git.len.brown@intel.com>
2007-02-13 5:49 ` [PATCH 41/41] ACPI: cleanup: make disable_acpi() valid w/o CONFIG_ACPI 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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox