NFC: st-nci: spi: Drop two useless checks in ACPI probe path

When st_nci_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 SPI 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/st-nci/spi.c b/drivers/nfc/st-nci/spi.c
index 51a863f0a987ab86c17c01cb2ad8f8f409975746..89e341eba3ebe97407412c1cec99a3868849493a 100644 (file)
--- a/drivers/nfc/st-nci/spi.c
+++ b/drivers/nfc/st-nci/spi.c
@@ -226,21 +226,10 @@ static struct nfc_phy_ops spi_phy_ops = {
 static int st_nci_spi_acpi_request_resources(struct spi_device *spi_dev)
 {
        struct st_nci_spi_phy *phy = spi_get_drvdata(spi_dev);
-       const struct acpi_device_id *id;
        struct gpio_desc *gpiod_reset;
-       struct device *dev;
+       struct device *dev = &spi_dev->dev;
        u8 tmp;
 
-       if (!spi_dev)
-               return -EINVAL;
-
-       dev = &spi_dev->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 RESET GPIO from ACPI */
        gpiod_reset = devm_gpiod_get_index(dev, ST_NCI_GPIO_NAME_RESET, 1,
                                           GPIOD_OUT_HIGH);