tpm/st33zp24: Switch to devm_acpi_dev_add_driver_gpios()
Switch to use managed variant of acpi_dev_add_driver_gpios() to simplify error path and fix potentially wrong assignment if ->probe() fails. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Jarkko Sakkinen <jarkko.sakkine@linux.intel.com> Tested-by: Jarkko Sakkinen <jarkko.sakkine@linux.intel.com> (compilation) Signed-off-by: Jarkko Sakkinen <jarkko.sakkine@linux.intel.com>
This commit is contained in:
parent
d8b5d94538
commit
23c3beae58
|
@ -127,7 +127,7 @@ static int st33zp24_i2c_acpi_request_resources(struct i2c_client *client)
|
|||
struct device *dev = &client->dev;
|
||||
int ret;
|
||||
|
||||
ret = acpi_dev_add_driver_gpios(ACPI_COMPANION(dev), acpi_st33zp24_gpios);
|
||||
ret = devm_acpi_dev_add_driver_gpios(dev, acpi_st33zp24_gpios);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
|
@ -285,7 +285,6 @@ static int st33zp24_i2c_remove(struct i2c_client *client)
|
|||
if (ret)
|
||||
return ret;
|
||||
|
||||
acpi_dev_remove_driver_gpios(ACPI_COMPANION(&client->dev));
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -246,7 +246,7 @@ static int st33zp24_spi_acpi_request_resources(struct spi_device *spi_dev)
|
|||
struct device *dev = &spi_dev->dev;
|
||||
int ret;
|
||||
|
||||
ret = acpi_dev_add_driver_gpios(ACPI_COMPANION(dev), acpi_st33zp24_gpios);
|
||||
ret = devm_acpi_dev_add_driver_gpios(dev, acpi_st33zp24_gpios);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
|
@ -402,7 +402,6 @@ static int st33zp24_spi_remove(struct spi_device *dev)
|
|||
if (ret)
|
||||
return ret;
|
||||
|
||||
acpi_dev_remove_driver_gpios(ACPI_COMPANION(&dev->dev));
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue