NFC: pn544: Drop two useless checks in ACPI probe path (dd215430) · Commits · 戴 / test

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>

drivers/nfc/pn544/i2c.c

+1 −13

Original line number	Diff line number	Diff line
		@@ -877,20 +877,8 @@ exit_state_wait_secure_write_answer:
		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,

Admin message