NFC: st21nfca: Drop two useless checks in ACPI probe path

When st21nfca_hci_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>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/drivers/nfc/st21nfca/i2c.c b/drivers/nfc/st21nfca/i2c.c
index a3153a30be5d91d6d50b234f9f96c6b96b223c62..5a82f553906cbc778f53d94a07f63db1e05d7edc 100644 (file)
--- a/drivers/nfc/st21nfca/i2c.c
+++ b/drivers/nfc/st21nfca/i2c.c
@@ -507,21 +507,10 @@ static struct nfc_phy_ops i2c_phy_ops = {
 static int st21nfca_hci_i2c_acpi_request_resources(struct i2c_client *client)
 {
        struct st21nfca_i2c_phy *phy = i2c_get_clientdata(client);
-       const struct acpi_device_id *id;
        struct gpio_desc *gpiod_ena;
-       struct device *dev;
+       struct device *dev = &client->dev;
        u8 tmp;
 
-       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;
-
        /* Get EN GPIO from ACPI */
        gpiod_ena = devm_gpiod_get_index(dev, ST21NFCA_GPIO_NAME_EN, 1,
                                         GPIOD_OUT_LOW);