Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd215430 authored by Mika Westerberg's avatar Mika Westerberg Committed by Samuel Ortiz
Browse files

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



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: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 03c05355

drivers/nfc/pn544/i2c.c

+1 −13
Original line number Diff line number Diff line
@@ -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,