| Message ID | f42094aa-fc5b-ab1f-26fc-7f6bf2d11a35@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | i2c: i801: Use pm_runtime_forbid to prevent suspending | expand |
On 20.05.2021 13:14, Heiner Kallweit wrote: > Using pm_runtime_get_sync() here is not the best approach. > pm_runtime_forbid() is better suited and it doesn't require > cleanup activities in the remove callback. > Please disregard this patch. The user may re-enable runtime pm via sysfs and that's not what we want. > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> > --- > drivers/i2c/busses/i2c-i801.c | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c > index 6b17afb7b..4e8dc2b0d 100644 > --- a/drivers/i2c/busses/i2c-i801.c > +++ b/drivers/i2c/busses/i2c-i801.c > @@ -1664,7 +1664,7 @@ i801_acpi_io_handler(u32 function, acpi_physical_address address, u32 bits, > * BIOS is accessing the host controller so prevent it from > * suspending automatically from now on. > */ > - pm_runtime_get_sync(&pdev->dev); > + pm_runtime_forbid(&pdev->dev); > } > > if ((function & ACPI_IO_MASK) == ACPI_READ) > @@ -1704,11 +1704,6 @@ static void i801_acpi_remove(struct i801_priv *priv) > > acpi_remove_address_space_handler(adev->handle, > ACPI_ADR_SPACE_SYSTEM_IO, i801_acpi_io_handler); > - > - mutex_lock(&priv->acpi_lock); > - if (priv->acpi_reserved) > - pm_runtime_put(&priv->pci_dev->dev); > - mutex_unlock(&priv->acpi_lock); > } > #else > static inline int i801_acpi_probe(struct i801_priv *priv) { return 0; } >
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c index 6b17afb7b..4e8dc2b0d 100644 --- a/drivers/i2c/busses/i2c-i801.c +++ b/drivers/i2c/busses/i2c-i801.c @@ -1664,7 +1664,7 @@ i801_acpi_io_handler(u32 function, acpi_physical_address address, u32 bits, * BIOS is accessing the host controller so prevent it from * suspending automatically from now on. */ - pm_runtime_get_sync(&pdev->dev); + pm_runtime_forbid(&pdev->dev); } if ((function & ACPI_IO_MASK) == ACPI_READ) @@ -1704,11 +1704,6 @@ static void i801_acpi_remove(struct i801_priv *priv) acpi_remove_address_space_handler(adev->handle, ACPI_ADR_SPACE_SYSTEM_IO, i801_acpi_io_handler); - - mutex_lock(&priv->acpi_lock); - if (priv->acpi_reserved) - pm_runtime_put(&priv->pci_dev->dev); - mutex_unlock(&priv->acpi_lock); } #else static inline int i801_acpi_probe(struct i801_priv *priv) { return 0; }
Using pm_runtime_get_sync() here is not the best approach. pm_runtime_forbid() is better suited and it doesn't require cleanup activities in the remove callback. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> --- drivers/i2c/busses/i2c-i801.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)