| From b0e0fa15176857c986e87d38c2f45a4bbf495b5a Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Wed, 4 Oct 2017 14:20:27 +0200 |
| Subject: [PATCH 0186/1795] spi: sh-msiof: Use of_device_get_match_data() |
| helper |
| |
| Use the of_device_get_match_data() helper instead of open coding. |
| |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| (cherry picked from commit ecb1596aa27856a256b0698a93d7be06ce041e73) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| drivers/spi/spi-sh-msiof.c | 6 ++---- |
| 1 file changed, 2 insertions(+), 4 deletions(-) |
| |
| diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c |
| index aa34f5ef53f7..a6e0c9cee35d 100644 |
| --- a/drivers/spi/spi-sh-msiof.c |
| +++ b/drivers/spi/spi-sh-msiof.c |
| @@ -1237,15 +1237,13 @@ static int sh_msiof_spi_probe(struct platform_device *pdev) |
| struct resource *r; |
| struct spi_master *master; |
| const struct sh_msiof_chipdata *chipdata; |
| - const struct of_device_id *of_id; |
| struct sh_msiof_spi_info *info; |
| struct sh_msiof_spi_priv *p; |
| int i; |
| int ret; |
| |
| - of_id = of_match_device(sh_msiof_match, &pdev->dev); |
| - if (of_id) { |
| - chipdata = of_id->data; |
| + chipdata = of_device_get_match_data(&pdev->dev); |
| + if (chipdata) { |
| info = sh_msiof_spi_parse_dt(&pdev->dev); |
| } else { |
| chipdata = (const void *)pdev->id_entry->driver_data; |
| -- |
| 2.19.0 |
| |
