| From 3abf36472ac08f2fbec6d7145e9be3050608486c Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Wed, 4 Oct 2017 14:19:03 +0200 |
| Subject: [PATCH 0183/1795] mtd: nand: sh_flctl: Use of_device_get_match_data() |
| helper |
| |
| Use the of_device_get_match_data() helper instead of open coding. |
| While at it, make config const so the cast can be dropped. |
| |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> |
| (cherry picked from commit b8640c5b8bef7e24fe54d2713f4c91b563a65c55) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| drivers/mtd/nand/sh_flctl.c | 9 +++------ |
| 1 file changed, 3 insertions(+), 6 deletions(-) |
| |
| diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c |
| index e7f3c98487e6..3c5008a4f5f3 100644 |
| --- a/drivers/mtd/nand/sh_flctl.c |
| +++ b/drivers/mtd/nand/sh_flctl.c |
| @@ -1094,14 +1094,11 @@ MODULE_DEVICE_TABLE(of, of_flctl_match); |
| |
| static struct sh_flctl_platform_data *flctl_parse_dt(struct device *dev) |
| { |
| - const struct of_device_id *match; |
| - struct flctl_soc_config *config; |
| + const struct flctl_soc_config *config; |
| struct sh_flctl_platform_data *pdata; |
| |
| - match = of_match_device(of_flctl_match, dev); |
| - if (match) |
| - config = (struct flctl_soc_config *)match->data; |
| - else { |
| + config = of_device_get_match_data(dev); |
| + if (!config) { |
| dev_err(dev, "%s: no OF configuration attached\n", __func__); |
| return NULL; |
| } |
| -- |
| 2.19.0 |
| |
