| Message ID | 1487943360-6421-1-git-send-email-a.hajda@samsung.com |
|---|---|
| State | Accepted |
| Headers | show |
Hello Andrzej, On 02/24/2017 10:36 AM, Andrzej Hajda wrote: > 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> Best regards,
Hi Wolfram, Gently ping. Regards Andrzej On 24.02.2017 14:36, Andrzej Hajda wrote: > 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> > --- > drivers/i2c/busses/i2c-exynos5.c | 15 +++------------ > 1 file changed, 3 insertions(+), 12 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-exynos5.c b/drivers/i2c/busses/i2c-exynos5.c > index bc2b5db..de3b6af 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), > @@ -773,8 +765,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) -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 03/06/2017 12:32 PM, Javier Martinez Canillas wrote: > Hello Andrzej, > > On 02/24/2017 10:36 AM, Andrzej Hajda wrote: >> 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> > I've also tested this patch on an Exynos5800 Peach Pi Chromebook: Tested-by: Javier Martinez Canillas <javier@osg.samsung.com> Best regards,
On Fri, Feb 24, 2017 at 02:36:00PM +0100, Andrzej Hajda wrote: > 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> Applied to for-next, thanks!
diff --git a/drivers/i2c/busses/i2c-exynos5.c b/drivers/i2c/busses/i2c-exynos5.c index bc2b5db..de3b6af 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), @@ -773,8 +765,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)
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> --- drivers/i2c/busses/i2c-exynos5.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-)