| Message ID | 1458719734-13752-3-git-send-email-christophe-h.ricard@st.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Mar 23, 2016 at 08:55:33AM +0100, Christophe Ricard wrote: > When st33zp24_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 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> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> /Jarkko > --- > drivers/char/tpm/st33zp24/spi.c | 13 +------------ > 1 file changed, 1 insertion(+), 12 deletions(-) > > diff --git a/drivers/char/tpm/st33zp24/spi.c b/drivers/char/tpm/st33zp24/spi.c > index 6be51ac..608dbc6 100644 > --- a/drivers/char/tpm/st33zp24/spi.c > +++ b/drivers/char/tpm/st33zp24/spi.c > @@ -232,19 +232,8 @@ static const struct st33zp24_phy_ops spi_phy_ops = { > static int st33zp24_spi_acpi_request_resources(struct spi_device *spi_dev) > { > struct st33zp24_spi_phy *phy = spi_get_drvdata(spi_dev); > - const struct acpi_device_id *id; > struct gpio_desc *gpiod_lpcpd; > - struct device *dev; > - > - 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; > + struct device *dev = &spi_dev->dev; > > /* Get LPCPD GPIO from ACPI */ > gpiod_lpcpd = devm_gpiod_get_index(dev, "TPM IO LPCPD", 1, > -- > 2.5.0 > ------------------------------------------------------------------------------ Transform Data into Opportunity. Accelerate data analysis in your applications with Intel Data Analytics Acceleration Library. Click to learn more. http://pubads.g.doubleclick.net/gampad/clk?id=278785351&iu=/4140
diff --git a/drivers/char/tpm/st33zp24/spi.c b/drivers/char/tpm/st33zp24/spi.c index 6be51ac..608dbc6 100644 --- a/drivers/char/tpm/st33zp24/spi.c +++ b/drivers/char/tpm/st33zp24/spi.c @@ -232,19 +232,8 @@ static const struct st33zp24_phy_ops spi_phy_ops = { static int st33zp24_spi_acpi_request_resources(struct spi_device *spi_dev) { struct st33zp24_spi_phy *phy = spi_get_drvdata(spi_dev); - const struct acpi_device_id *id; struct gpio_desc *gpiod_lpcpd; - struct device *dev; - - 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; + struct device *dev = &spi_dev->dev; /* Get LPCPD GPIO from ACPI */ gpiod_lpcpd = devm_gpiod_get_index(dev, "TPM IO LPCPD", 1,
When st33zp24_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 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> --- drivers/char/tpm/st33zp24/spi.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)