Skip to content

Commit

Permalink
NFC: pn544: Drop two useless checks in ACPI probe path
Browse files Browse the repository at this point in the history
When pn544_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: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
  • Loading branch information
Mika Westerberg authored and Samuel Ortiz committed Mar 3, 2016
1 parent 03c0535 commit dd21543
Showing 1 changed file with 1 addition and 13 deletions.
14 changes: 1 addition & 13 deletions drivers/nfc/pn544/i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -877,20 +877,8 @@ static void pn544_hci_i2c_fw_work(struct work_struct *work)
static int pn544_hci_i2c_acpi_request_resources(struct i2c_client *client)
{
struct pn544_i2c_phy *phy = i2c_get_clientdata(client);
const struct acpi_device_id *id;
struct gpio_desc *gpiod_en, *gpiod_fw;
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 EN GPIO from ACPI */
gpiod_en = devm_gpiod_get_index(dev, PN544_GPIO_NAME_EN, 1,
Expand Down

0 comments on commit dd21543

Please sign in to comment.