| Message ID | 20220709000636.35550-3-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
| Series | [v1,1/7] platform/x86: serial-multi-instantiate: return -ENOENT when no resources found | expand |
Hi, On 7/9/22 02:06, Andy Shevchenko wrote: > The device_get_match_data() checks for firmware node to be present, > there is no need to check for ACPI companion. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Patches 3-7 look good to me, you may add my: Reviewed-by: Hans de Goede <hdegoede@redhat.com> after rebasing to drop patches 1 + 2. Regards, Hans > --- > .../platform/x86/serial-multi-instantiate.c | 21 +++++++------------ > 1 file changed, 8 insertions(+), 13 deletions(-) > > diff --git a/drivers/platform/x86/serial-multi-instantiate.c b/drivers/platform/x86/serial-multi-instantiate.c > index e599058196bb..ceb0e414b9f5 100644 > --- a/drivers/platform/x86/serial-multi-instantiate.c > +++ b/drivers/platform/x86/serial-multi-instantiate.c > @@ -81,16 +81,16 @@ static void smi_devs_unregister(struct smi *smi) > /** > * smi_spi_probe - Instantiate multiple SPI devices from inst array > * @pdev: Platform device > - * @adev: ACPI device > * @smi: Internal struct for Serial multi instantiate driver > * @inst_array: Array of instances to probe > * > * Returns the number of SPI devices instantiate, Zero if none is found or a negative error code. > */ > -static int smi_spi_probe(struct platform_device *pdev, struct acpi_device *adev, struct smi *smi, > +static int smi_spi_probe(struct platform_device *pdev, struct smi *smi, > const struct smi_instance *inst_array) > { > struct device *dev = &pdev->dev; > + struct acpi_device *adev = ACPI_COMPANION(dev); > struct spi_controller *ctlr; > struct spi_device *spi_dev; > char name[50]; > @@ -166,17 +166,17 @@ static int smi_spi_probe(struct platform_device *pdev, struct acpi_device *adev, > /** > * smi_i2c_probe - Instantiate multiple I2C devices from inst array > * @pdev: Platform device > - * @adev: ACPI device > * @smi: Internal struct for Serial multi instantiate driver > * @inst_array: Array of instances to probe > * > * Returns the number of I2C devices instantiate, Zero if none is found or a negative error code. > */ > -static int smi_i2c_probe(struct platform_device *pdev, struct acpi_device *adev, struct smi *smi, > +static int smi_i2c_probe(struct platform_device *pdev, struct smi *smi, > const struct smi_instance *inst_array) > { > struct i2c_board_info board_info = {}; > struct device *dev = &pdev->dev; > + struct acpi_device *adev = ACPI_COMPANION(dev); > char name[32]; > int i, ret, count; > > @@ -230,14 +230,9 @@ static int smi_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > const struct smi_node *node; > - struct acpi_device *adev; > struct smi *smi; > int ret; > > - adev = ACPI_COMPANION(dev); > - if (!adev) > - return -ENODEV; > - > node = device_get_match_data(dev); > if (!node) { > dev_dbg(dev, "Error ACPI match data is missing\n"); > @@ -252,14 +247,14 @@ static int smi_probe(struct platform_device *pdev) > > switch (node->bus_type) { > case SMI_I2C: > - return smi_i2c_probe(pdev, adev, smi, node->instances); > + return smi_i2c_probe(pdev, smi, node->instances); > case SMI_SPI: > - return smi_spi_probe(pdev, adev, smi, node->instances); > + return smi_spi_probe(pdev, smi, node->instances); > case SMI_AUTO_DETECT: > - ret = smi_i2c_probe(pdev, adev, smi, node->instances); > + ret = smi_i2c_probe(pdev, smi, node->instances); > if (ret && ret != -ENOENT) > return ret; > - ret = smi_spi_probe(pdev, adev, smi, node->instances); > + ret = smi_spi_probe(pdev, smi, node->instances); > if (ret && ret != -ENOENT) > return ret; > if (ret)
diff --git a/drivers/platform/x86/serial-multi-instantiate.c b/drivers/platform/x86/serial-multi-instantiate.c index e599058196bb..ceb0e414b9f5 100644 --- a/drivers/platform/x86/serial-multi-instantiate.c +++ b/drivers/platform/x86/serial-multi-instantiate.c @@ -81,16 +81,16 @@ static void smi_devs_unregister(struct smi *smi) /** * smi_spi_probe - Instantiate multiple SPI devices from inst array * @pdev: Platform device - * @adev: ACPI device * @smi: Internal struct for Serial multi instantiate driver * @inst_array: Array of instances to probe * * Returns the number of SPI devices instantiate, Zero if none is found or a negative error code. */ -static int smi_spi_probe(struct platform_device *pdev, struct acpi_device *adev, struct smi *smi, +static int smi_spi_probe(struct platform_device *pdev, struct smi *smi, const struct smi_instance *inst_array) { struct device *dev = &pdev->dev; + struct acpi_device *adev = ACPI_COMPANION(dev); struct spi_controller *ctlr; struct spi_device *spi_dev; char name[50]; @@ -166,17 +166,17 @@ static int smi_spi_probe(struct platform_device *pdev, struct acpi_device *adev, /** * smi_i2c_probe - Instantiate multiple I2C devices from inst array * @pdev: Platform device - * @adev: ACPI device * @smi: Internal struct for Serial multi instantiate driver * @inst_array: Array of instances to probe * * Returns the number of I2C devices instantiate, Zero if none is found or a negative error code. */ -static int smi_i2c_probe(struct platform_device *pdev, struct acpi_device *adev, struct smi *smi, +static int smi_i2c_probe(struct platform_device *pdev, struct smi *smi, const struct smi_instance *inst_array) { struct i2c_board_info board_info = {}; struct device *dev = &pdev->dev; + struct acpi_device *adev = ACPI_COMPANION(dev); char name[32]; int i, ret, count; @@ -230,14 +230,9 @@ static int smi_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; const struct smi_node *node; - struct acpi_device *adev; struct smi *smi; int ret; - adev = ACPI_COMPANION(dev); - if (!adev) - return -ENODEV; - node = device_get_match_data(dev); if (!node) { dev_dbg(dev, "Error ACPI match data is missing\n"); @@ -252,14 +247,14 @@ static int smi_probe(struct platform_device *pdev) switch (node->bus_type) { case SMI_I2C: - return smi_i2c_probe(pdev, adev, smi, node->instances); + return smi_i2c_probe(pdev, smi, node->instances); case SMI_SPI: - return smi_spi_probe(pdev, adev, smi, node->instances); + return smi_spi_probe(pdev, smi, node->instances); case SMI_AUTO_DETECT: - ret = smi_i2c_probe(pdev, adev, smi, node->instances); + ret = smi_i2c_probe(pdev, smi, node->instances); if (ret && ret != -ENOENT) return ret; - ret = smi_spi_probe(pdev, adev, smi, node->instances); + ret = smi_spi_probe(pdev, smi, node->instances); if (ret && ret != -ENOENT) return ret; if (ret)
The device_get_match_data() checks for firmware node to be present, there is no need to check for ACPI companion. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- .../platform/x86/serial-multi-instantiate.c | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-)