diff options
| author |   Christophe Ricard <christophe.ricard@gmail.com> | 2016-04-30 09:12:44 +0200 |
|---|---|---|
| committer |   Samuel Ortiz <sameo@linux.intel.com> | 2016-05-04 01:36:24 +0200 |
| commit | 070718a499cea9e6d7e6404788490574dfb71388 (patch) | |
| tree | 95b9fc8abc06ace6743a73f2bb924766a4c95b01 /drivers/nfc/st21nfca | |
| parent | nfc: st21nfca: A APDU_READER_GATE pipe is unexpected on a UICC (diff) | |
| download | linux-dev-070718a499cea9e6d7e6404788490574dfb71388.tar.xz linux-dev-070718a499cea9e6d7e6404788490574dfb71388.zip | |
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>
Diffstat (limited to 'drivers/nfc/st21nfca')
| -rw-r--r-- | drivers/nfc/st21nfca/i2c.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/nfc/st21nfca/i2c.c b/drivers/nfc/st21nfca/i2c.c index a3153a30be5d..5a82f553906c 100644 --- 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); |