瀏覽代碼

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>
Andy Shevchenko 8 年之前
父節點
當前提交
23c3beae58
共有 2 個文件被更改,包括 2 次插入4 次删除
  1. 1 2
      drivers/char/tpm/st33zp24/i2c.c
  2. 1 2
      drivers/char/tpm/st33zp24/spi.c

+ 1 - 2
drivers/char/tpm/st33zp24/i2c.c

@@ -127,7 +127,7 @@ static int st33zp24_i2c_acpi_request_resources(struct i2c_client *client)
 	struct device *dev = &client->dev;
 	struct device *dev = &client->dev;
 	int ret;
 	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)
 	if (ret)
 		return ret;
 		return ret;
 
 
@@ -285,7 +285,6 @@ static int st33zp24_i2c_remove(struct i2c_client *client)
 	if (ret)
 	if (ret)
 		return ret;
 		return ret;
 
 
-	acpi_dev_remove_driver_gpios(ACPI_COMPANION(&client->dev));
 	return 0;
 	return 0;
 }
 }
 
 

+ 1 - 2
drivers/char/tpm/st33zp24/spi.c

@@ -246,7 +246,7 @@ static int st33zp24_spi_acpi_request_resources(struct spi_device *spi_dev)
 	struct device *dev = &spi_dev->dev;
 	struct device *dev = &spi_dev->dev;
 	int ret;
 	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)
 	if (ret)
 		return ret;
 		return ret;
 
 
@@ -402,7 +402,6 @@ static int st33zp24_spi_remove(struct spi_device *dev)
 	if (ret)
 	if (ret)
 		return ret;
 		return ret;
 
 
-	acpi_dev_remove_driver_gpios(ACPI_COMPANION(&dev->dev));
 	return 0;
 	return 0;
 }
 }