Use the of_device_get_match_data() helper instead of open coding. Signed-off-by: Tian Tao <tiantao6@xxxxxxxxxxxxx> --- v2: Removed forced type conversions --- drivers/spi/spi-davinci.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c index 7453a1d..9122235 100644 --- a/drivers/spi/spi-davinci.c +++ b/drivers/spi/spi-davinci.c @@ -817,19 +817,16 @@ static int spi_davinci_get_pdata(struct platform_device *pdev, struct davinci_spi *dspi) { struct device_node *node = pdev->dev.of_node; - struct davinci_spi_of_data *spi_data; + const struct davinci_spi_of_data *spi_data; struct davinci_spi_platform_data *pdata; unsigned int num_cs, intr_line = 0; - const struct of_device_id *match; pdata = &dspi->pdata; - match = of_match_device(davinci_spi_of_match, &pdev->dev); - if (!match) + spi_data = of_device_get_match_data(&pdev->dev); + if (!spi_data) return -ENODEV; - spi_data = (struct davinci_spi_of_data *)match->data; - pdata->version = spi_data->version; pdata->prescaler_limit = spi_data->prescaler_limit; /* -- 2.7.4