diff options
| author | Andrzej Hajda <a.hajda@samsung.com> | 2017-02-24 14:36:00 +0100 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2017-04-21 14:02:41 +0200 |
| commit | b371f866d9e1eebd6048c644b4a0e78eb951c3b3 (patch) | |
| tree | 63e155892af519288bc895f40977c492a1c1293f /drivers/i2c/busses | |
| parent | 70c8c4e9bf3b586516b0cd224bb3aed008efc300 (diff) | |
| download | linux-stable-b371f866d9e1eebd6048c644b4a0e78eb951c3b3.tar.gz linux-stable-b371f866d9e1eebd6048c644b4a0e78eb951c3b3.tar.bz2 linux-stable-b371f866d9e1eebd6048c644b4a0e78eb951c3b3.zip | |
i2c: exynos5: use core helper to get driver data
Driver core provides of_device_get_match_data which can be used
to get driver data instead of custom helper.
Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
Tested-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c/busses')
| -rw-r--r-- | drivers/i2c/busses/i2c-exynos5.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/i2c/busses/i2c-exynos5.c b/drivers/i2c/busses/i2c-exynos5.c index a1e1e7cba448..23ed4d67ecad 100644 --- a/drivers/i2c/busses/i2c-exynos5.c +++ b/drivers/i2c/busses/i2c-exynos5.c @@ -22,6 +22,7 @@ #include <linux/slab.h> #include <linux/io.h> #include <linux/of_address.h> +#include <linux/of_device.h> #include <linux/of_irq.h> #include <linux/spinlock.h> @@ -201,7 +202,7 @@ struct exynos5_i2c { unsigned int op_clock; /* Version of HS-I2C Hardware */ - struct exynos_hsi2c_variant *variant; + const struct exynos_hsi2c_variant *variant; }; /** @@ -247,15 +248,6 @@ static const struct of_device_id exynos5_i2c_match[] = { }; MODULE_DEVICE_TABLE(of, exynos5_i2c_match); -static inline struct exynos_hsi2c_variant *exynos5_i2c_get_variant - (struct platform_device *pdev) -{ - const struct of_device_id *match; - - match = of_match_node(exynos5_i2c_match, pdev->dev.of_node); - return (struct exynos_hsi2c_variant *)match->data; -} - static void exynos5_i2c_clr_pend_irq(struct exynos5_i2c *i2c) { writel(readl(i2c->regs + HSI2C_INT_STATUS), @@ -774,8 +766,7 @@ static int exynos5_i2c_probe(struct platform_device *pdev) goto err_clk; } - /* Need to check the variant before setting up. */ - i2c->variant = exynos5_i2c_get_variant(pdev); + i2c->variant = of_device_get_match_data(&pdev->dev); ret = exynos5_hsi2c_clock_setup(i2c); if (ret) |