diff options
| author | Christophe Ricard <christophe.ricard@gmail.com> | 2016-03-23 03:55:33 -0400 |
|---|---|---|
| committer | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> | 2016-06-25 10:26:35 -0400 |
| commit | 20ab99f89d574ba3c3944a6682bec5a6e0c0dcd9 (patch) | |
| tree | dd1adf866b1d5e90230ceca5f5f9833dd2bcec8f /drivers/char | |
| parent | 32da5633dcb9115d477f1ce8893ac4da087f56da (diff) | |
tpm/st33zp24/spi: Drop two useless checks in ACPI probe path
When st33zp24_spi_acpi_request_resources() gets called we
already know that the entries in ->acpi_match_table have matched ACPI ID
of the device.
In addition spi_device pointer cannot be NULL in any case (otherwise I2C
core would not call ->probe() for the driver in the first place).
Drop the two useless checks from the driver.
Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/tpm/st33zp24/spi.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/char/tpm/st33zp24/spi.c b/drivers/char/tpm/st33zp24/spi.c index 6be51ac0c1f1..608dbc620b18 100644 --- a/drivers/char/tpm/st33zp24/spi.c +++ b/drivers/char/tpm/st33zp24/spi.c | |||
| @@ -232,19 +232,8 @@ static const struct st33zp24_phy_ops spi_phy_ops = { | |||
| 232 | static int st33zp24_spi_acpi_request_resources(struct spi_device *spi_dev) | 232 | static int st33zp24_spi_acpi_request_resources(struct spi_device *spi_dev) |
| 233 | { | 233 | { |
| 234 | struct st33zp24_spi_phy *phy = spi_get_drvdata(spi_dev); | 234 | struct st33zp24_spi_phy *phy = spi_get_drvdata(spi_dev); |
| 235 | const struct acpi_device_id *id; | ||
| 236 | struct gpio_desc *gpiod_lpcpd; | 235 | struct gpio_desc *gpiod_lpcpd; |
| 237 | struct device *dev; | 236 | struct device *dev = &spi_dev->dev; |
| 238 | |||
| 239 | if (!spi_dev) | ||
| 240 | return -EINVAL; | ||
| 241 | |||
| 242 | dev = &spi_dev->dev; | ||
| 243 | |||
| 244 | /* Match the struct device against a given list of ACPI IDs */ | ||
| 245 | id = acpi_match_device(dev->driver->acpi_match_table, dev); | ||
| 246 | if (!id) | ||
| 247 | return -ENODEV; | ||
| 248 | 237 | ||
| 249 | /* Get LPCPD GPIO from ACPI */ | 238 | /* Get LPCPD GPIO from ACPI */ |
| 250 | gpiod_lpcpd = devm_gpiod_get_index(dev, "TPM IO LPCPD", 1, | 239 | gpiod_lpcpd = devm_gpiod_get_index(dev, "TPM IO LPCPD", 1, |