mirror of
https://github.com/torvalds/linux.git
synced 2024-11-27 06:31:52 +00:00
platform/x86: hp_accel: Remove _INI method call
According to ACPI specification the _INI method must be called when device is enumerated first time. After that there is no need to repeat the procedure. Convert the lis3lv02d_acpi_init() to be a stub (Note, we may not remove it because it is called unconditionally by the accelerometer main driver). Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Tested-by: Kai-Heng Feng <kai.heng.feng@canonical.com> Link: https://lore.kernel.org/r/20210823093222.19544-2-andriy.shevchenko@linux.intel.com Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
parent
0c59e612c0
commit
34570a898e
@ -271,7 +271,6 @@ struct lis3lv02d {
|
||||
int regs_size;
|
||||
u8 *reg_cache;
|
||||
bool regs_stored;
|
||||
bool init_required;
|
||||
u8 odr_mask; /* ODR bit mask */
|
||||
u8 whoami; /* indicates measurement precision */
|
||||
s16 (*read_data) (struct lis3lv02d *lis3, int reg);
|
||||
|
@ -78,23 +78,14 @@ static const struct acpi_device_id lis3lv02d_device_ids[] = {
|
||||
};
|
||||
MODULE_DEVICE_TABLE(acpi, lis3lv02d_device_ids);
|
||||
|
||||
|
||||
/**
|
||||
* lis3lv02d_acpi_init - ACPI _INI method: initialize the device.
|
||||
* lis3lv02d_acpi_init - initialize the device for ACPI
|
||||
* @lis3: pointer to the device struct
|
||||
*
|
||||
* Returns 0 on success.
|
||||
*/
|
||||
static int lis3lv02d_acpi_init(struct lis3lv02d *lis3)
|
||||
{
|
||||
struct acpi_device *dev = lis3->bus_priv;
|
||||
if (!lis3->init_required)
|
||||
return 0;
|
||||
|
||||
if (acpi_evaluate_object(dev->handle, METHOD_NAME__INI,
|
||||
NULL, NULL) != AE_OK)
|
||||
return -EINVAL;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -359,7 +350,6 @@ static int lis3lv02d_add(struct acpi_device *device)
|
||||
}
|
||||
|
||||
/* call the core layer do its init */
|
||||
lis3_dev.init_required = true;
|
||||
ret = lis3lv02d_init_device(&lis3_dev);
|
||||
if (ret)
|
||||
return ret;
|
||||
@ -407,14 +397,12 @@ static int lis3lv02d_suspend(struct device *dev)
|
||||
|
||||
static int lis3lv02d_resume(struct device *dev)
|
||||
{
|
||||
lis3_dev.init_required = false;
|
||||
lis3lv02d_poweron(&lis3_dev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int lis3lv02d_restore(struct device *dev)
|
||||
{
|
||||
lis3_dev.init_required = true;
|
||||
lis3lv02d_poweron(&lis3_dev);
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user