Message ID | 20220214060819.7334-23-yong.wu@mediatek.com |
---|---|
State | New |
Headers | show |
Series | None | expand |
On 2/14/22 07:08, Yong Wu wrote: > Use the common compare helper from component. > > Cc: Helge Deller <deller@gmx.de> > Cc: linux-omap@vger.kernel.org > Cc: linux-fbdev@vger.kernel.org > Signed-off-by: Yong Wu <yong.wu@mediatek.com> Applied to the fbdev for-next branch. Thanks! Helge > drivers/video/fbdev/omap2/omapfb/dss/dss.c | 8 +------- > 1 file changed, 1 insertion(+), 7 deletions(-) > > diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dss.c b/drivers/video/fbdev/omap2/omapfb/dss/dss.c > index a6b1c1598040..45b9d3cf3860 100644 > --- a/drivers/video/fbdev/omap2/omapfb/dss/dss.c > +++ b/drivers/video/fbdev/omap2/omapfb/dss/dss.c > @@ -1193,12 +1193,6 @@ static const struct component_master_ops dss_component_ops = { > .unbind = dss_unbind, > }; > > -static int dss_component_compare(struct device *dev, void *data) > -{ > - struct device *child = data; > - return dev == child; > -} > - > static int dss_add_child_component(struct device *dev, void *data) > { > struct component_match **match = data; > @@ -1212,7 +1206,7 @@ static int dss_add_child_component(struct device *dev, void *data) > if (strstr(dev_name(dev), "rfbi")) > return 0; > > - component_match_add(dev->parent, match, dss_component_compare, dev); > + component_match_add(dev->parent, match, component_compare_dev, dev); > > return 0; > } >
On Tue, Feb 15, 2022 at 09:46:24PM +0100, Helge Deller wrote: > On 2/14/22 07:08, Yong Wu wrote: > > Use the common compare helper from component. > > > > Cc: Helge Deller <deller@gmx.de> > > Cc: linux-omap@vger.kernel.org > > Cc: linux-fbdev@vger.kernel.org > > Signed-off-by: Yong Wu <yong.wu@mediatek.com> > > Applied to the fbdev for-next branch. That will break the build, it needs patch 1/23 to build properly :(
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dss.c b/drivers/video/fbdev/omap2/omapfb/dss/dss.c index a6b1c1598040..45b9d3cf3860 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/dss.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/dss.c @@ -1193,12 +1193,6 @@ static const struct component_master_ops dss_component_ops = { .unbind = dss_unbind, }; -static int dss_component_compare(struct device *dev, void *data) -{ - struct device *child = data; - return dev == child; -} - static int dss_add_child_component(struct device *dev, void *data) { struct component_match **match = data; @@ -1212,7 +1206,7 @@ static int dss_add_child_component(struct device *dev, void *data) if (strstr(dev_name(dev), "rfbi")) return 0; - component_match_add(dev->parent, match, dss_component_compare, dev); + component_match_add(dev->parent, match, component_compare_dev, dev); return 0; }
Use the common compare helper from component. Cc: Helge Deller <deller@gmx.de> Cc: linux-omap@vger.kernel.org Cc: linux-fbdev@vger.kernel.org Signed-off-by: Yong Wu <yong.wu@mediatek.com> --- drivers/video/fbdev/omap2/omapfb/dss/dss.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)