leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lis3: solve dependency between core and ACPI

Browse Source 
This solves the dependency between lis3lv02d.[ch] and ACPI specific
methods.  It introduces a ->bus_priv pointer to the device struct which is
casted to 'struct acpi_device' in the ACIP layer.  Changed hp_accel.c
accordingly.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Acked-by: Pavel Machek <pavel@ucw.cz>
Acked-by: Eric Piel <eric.piel@tremplin-utc.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Daniel Mack
2009-03-31 15:24:32 -07:00
committed by Linus Torvalds
parent ab337a6327
commit a38da2ed74
3 changed files with 105 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
drivers/hwmon/hp_accel.c
View File

@@ -85,25 +85,31 @@ MODULE_DEVICE_TABLE(acpi, lis3lv02d_device_ids);
/**
* lis3lv02d_acpi_init - ACPI _INI method: initialize the device.
* @handle: the handle of the device
* @lis3: pointer to the device struct
*
* Returns AE_OK on success.
* Returns 0 on success.
*/
acpi_status lis3lv02d_acpi_init(acpi_handle handle)
int lis3lv02d_acpi_init(struct lis3lv02d *lis3)
{
return acpi_evaluate_object(handle, METHOD_NAME__INI, NULL, NULL);
struct acpi_device *dev = lis3->bus_priv;
if (acpi_evaluate_object(dev->handle, METHOD_NAME__INI,
NULL, NULL) != AE_OK)
return -EINVAL;
return 0;
}
/**
* lis3lv02d_acpi_read - ACPI ALRD method: read a register
* @handle: the handle of the device
* @lis3: pointer to the device struct
* @reg: the register to read
* @ret: result of the operation
*
* Returns AE_OK on success.
* Returns 0 on success.
*/
acpi_status lis3lv02d_acpi_read(acpi_handle handle, int reg, u8 *ret)
int lis3lv02d_acpi_read(struct lis3lv02d *lis3, int reg, u8 *ret)
{
struct acpi_device *dev = lis3->bus_priv;
union acpi_object arg0 = { ACPI_TYPE_INTEGER };
struct acpi_object_list args = { 1, &arg0 };
unsigned long long lret;
@@ -111,21 +117,22 @@ acpi_status lis3lv02d_acpi_read(acpi_handle handle, int reg, u8 *ret)
arg0.integer.value = reg;
status = acpi_evaluate_integer(handle, "ALRD", &args, &lret);
status = acpi_evaluate_integer(dev->handle, "ALRD", &args, &lret);
*ret = lret;
return status;
return (status != AE_OK) ? -EINVAL : 0;
}
/**
* lis3lv02d_acpi_write - ACPI ALWR method: write to a register
* @handle: the handle of the device
* @lis3: pointer to the device struct
* @reg: the register to write to
* @val: the value to write
*
* Returns AE_OK on success.
* Returns 0 on success.
*/
acpi_status lis3lv02d_acpi_write(acpi_handle handle, int reg, u8 val)
int lis3lv02d_acpi_write(struct lis3lv02d *lis3, int reg, u8 val)
{
struct acpi_device *dev = lis3->bus_priv;
unsigned long long ret; /* Not used when writting */
union acpi_object in_obj[2];
struct acpi_object_list args = { 2, in_obj };
@@ -135,7 +142,10 @@ acpi_status lis3lv02d_acpi_write(acpi_handle handle, int reg, u8 val)
in_obj[1].type = ACPI_TYPE_INTEGER;
in_obj[1].integer.value = val;
return acpi_evaluate_integer(handle, "ALWR", &args, &ret);
if (acpi_evaluate_integer(dev->handle, "ALWR", &args, &ret) != AE_OK)
return -EINVAL;
return 0;
}
static int lis3lv02d_dmi_matched(const struct dmi_system_id *dmi)
@@ -217,7 +227,7 @@ static struct dmi_system_id lis3lv02d_dmi_ids[] = {
static void hpled_set(struct delayed_led_classdev *led_cdev, enum led_brightness value)
{
acpi_handle handle = lis3_dev.device->handle;
struct acpi_device *dev = lis3_dev.bus_priv;
unsigned long long ret; /* Not used when writing */
union acpi_object in_obj[1];
struct acpi_object_list args = { 1, in_obj };
@@ -225,7 +235,7 @@ static void hpled_set(struct delayed_led_classdev *led_cdev, enum led_brightness
in_obj[0].type = ACPI_TYPE_INTEGER;
in_obj[0].integer.value = !!value;
acpi_evaluate_integer(handle, "ALED", &args, &ret);
acpi_evaluate_integer(dev->handle, "ALED", &args, &ret);
}
static struct delayed_led_classdev hpled_led = {
@@ -262,23 +272,6 @@ static void lis3lv02d_enum_resources(struct acpi_device *device)
printk(KERN_DEBUG DRIVER_NAME ": Error getting resources\n");
}
static s16 lis3lv02d_read_16(acpi_handle handle, int reg)
{
u8 lo, hi;
lis3_dev.read(handle, reg - 1, &lo);
lis3_dev.read(handle, reg, &hi);
/* In "12 bit right justified" mode, bit 6, bit 7, bit 8 = bit 5 */
return (s16)((hi << 8) | lo);
}
static s16 lis3lv02d_read_8(acpi_handle handle, int reg)
{
s8 lo;
lis3_dev.read(handle, reg, &lo);
return lo;
}
static int lis3lv02d_add(struct acpi_device *device)
{
int ret;
@@ -286,7 +279,7 @@ static int lis3lv02d_add(struct acpi_device *device)
if (!device)
return -EINVAL;
lis3_dev.device = device;
lis3_dev.bus_priv = device;
lis3_dev.init = lis3lv02d_acpi_init;
lis3_dev.read = lis3lv02d_acpi_read;
lis3_dev.write = lis3lv02d_acpi_write;
@@ -294,23 +287,8 @@ static int lis3lv02d_add(struct acpi_device *device)
strcpy(acpi_device_class(device), ACPI_MDPS_CLASS);
device->driver_data = &lis3_dev;
lis3lv02d_acpi_read(device->handle, WHO_AM_I, &lis3_dev.whoami);
switch (lis3_dev.whoami) {
case LIS_DOUBLE_ID:
printk(KERN_INFO DRIVER_NAME ": 2-byte sensor found\n");
lis3_dev.read_data = lis3lv02d_read_16;
lis3_dev.mdps_max_val = 2048;
break;
case LIS_SINGLE_ID:
printk(KERN_INFO DRIVER_NAME ": 1-byte sensor found\n");
lis3_dev.read_data = lis3lv02d_read_8;
lis3_dev.mdps_max_val = 128;
break;
default:
printk(KERN_ERR DRIVER_NAME
": unknown sensor type 0x%X\n", lis3_dev.whoami);
return -EINVAL;
}
/* obtain IRQ number of our device from ACPI */
lis3lv02d_enum_resources(device);
/* If possible use a "standard" axes order */
if (dmi_check_system(lis3lv02d_dmi_ids) == 0) {
@@ -319,18 +297,17 @@ static int lis3lv02d_add(struct acpi_device *device)
lis3_dev.ac = lis3lv02d_axis_normal;
}
INIT_WORK(&hpled_led.work, delayed_set_status_worker);
ret = led_classdev_register(NULL, &hpled_led.led_classdev);
/* call the core layer do its init */
ret = lis3lv02d_init_device(&lis3_dev);
if (ret)
return ret;
/* obtain IRQ number of our device from ACPI */
lis3lv02d_enum_resources(lis3_dev.device);
ret = lis3lv02d_init_device(&lis3_dev);
INIT_WORK(&hpled_led.work, delayed_set_status_worker);
ret = led_classdev_register(NULL, &hpled_led.led_classdev);
if (ret) {
lis3lv02d_joystick_disable();
lis3lv02d_poweroff(&lis3_dev);
flush_work(&hpled_led.work);
led_classdev_unregister(&hpled_led.led_classdev);
return ret;
}
@@ -343,7 +320,7 @@ static int lis3lv02d_remove(struct acpi_device *device, int type)
return -EINVAL;
lis3lv02d_joystick_disable();
lis3lv02d_poweroff(device->handle);
lis3lv02d_poweroff(&lis3_dev);
flush_work(&hpled_led.work);
led_classdev_unregister(&hpled_led.led_classdev);
@@ -356,7 +333,7 @@ static int lis3lv02d_remove(struct acpi_device *device, int type)
static int lis3lv02d_suspend(struct acpi_device *device, pm_message_t state)
{
/* make sure the device is off when we suspend */
lis3lv02d_poweroff(device->handle);
lis3lv02d_poweroff(&lis3_dev);
return 0;
}
@@ -365,9 +342,9 @@ static int lis3lv02d_resume(struct acpi_device *device)
/* put back the device in the right state (ACPI might turn it on) */
mutex_lock(&lis3_dev.lock);
if (lis3_dev.usage > 0)
lis3lv02d_poweron(device->handle);
lis3lv02d_poweron(&lis3_dev);
else
lis3lv02d_poweroff(device->handle);
lis3lv02d_poweroff(&lis3_dev);
mutex_unlock(&lis3_dev.lock);
return 0;
}