tpm/st33zp24/i2c: Drop two useless checks in ACPI probe path
authorChristophe Ricard <christophe.ricard@gmail.com>
Wed, 23 Mar 2016 07:55:32 +0000 (08:55 +0100)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Sat, 25 Jun 2016 14:26:35 +0000 (17:26 +0300)
When st33zp24_i2c_acpi_request_resources() gets called we
already know that the entries in ->acpi_match_table have matched ACPI ID
of the device.
In addition I2C client 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>
drivers/char/tpm/st33zp24/i2c.c

index f179aad..f8e8123 100644 (file)
@@ -113,19 +113,8 @@ static const struct st33zp24_phy_ops i2c_phy_ops = {
 static int st33zp24_i2c_acpi_request_resources(struct i2c_client *client)
 {
        struct st33zp24_i2c_phy *phy = i2c_get_clientdata(client);
-       const struct acpi_device_id *id;
        struct gpio_desc *gpiod_lpcpd;
-       struct device *dev;
-
-       if (!client)
-               return -EINVAL;
-
-       dev = &client->dev;
-
-       /* Match the struct device against a given list of ACPI IDs */
-       id = acpi_match_device(dev->driver->acpi_match_table, dev);
-       if (!id)
-               return -ENODEV;
+       struct device *dev = &client->dev;
 
        /* Get LPCPD GPIO from ACPI */
        gpiod_lpcpd = devm_gpiod_get_index(dev, "TPM IO LPCPD", 1,