iio: adc: mcp3564: drop redundant open-coded spi_get_device_match_data()
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Thu, 6 Jun 2024 14:26:50 +0000 (16:26 +0200)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Thu, 13 Jun 2024 18:19:24 +0000 (19:19 +0100)
The driver calls spi_get_device_match_data() and on its failure calls
again parts of it: spi_get_device_id() and getting driver data.  This is
entirely redundant, because it is part of spi_get_device_match_data().

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Nuno Sa <nuno.sa@analog.com>
Link: https://lore.kernel.org/r/20240606-spi-match-data-v1-8-320b291ee1fe@linaro.org
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/adc/mcp3564.c

index e2ae13f..d83bed0 100644 (file)
@@ -1114,7 +1114,6 @@ static int mcp3564_config(struct iio_dev *indio_dev)
 {
        struct mcp3564_state *adc = iio_priv(indio_dev);
        struct device *dev = &adc->spi->dev;
-       const struct spi_device_id *dev_id;
        u8 tmp_reg;
        u16 tmp_u16;
        enum mcp3564_ids ids;
@@ -1212,11 +1211,6 @@ static int mcp3564_config(struct iio_dev *indio_dev)
                 * try using fallback compatible in device tree to deal with some newer part number.
                 */
                adc->chip_info = spi_get_device_match_data(adc->spi);
-               if (!adc->chip_info) {
-                       dev_id = spi_get_device_id(adc->spi);
-                       adc->chip_info = (const struct mcp3564_chip_info *)dev_id->driver_data;
-               }
-
                adc->have_vref = adc->chip_info->have_vref;
        } else {
                adc->chip_info = &mcp3564_chip_infos_tbl[ids];