* [PATCH] net/fec: fix compile error introduced by dt support
@ 2011-03-25 7:13 Shawn Guo
[not found] ` <1301037238-4031-1-git-send-email-shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
0 siblings, 1 reply; 6+ messages in thread
From: Shawn Guo @ 2011-03-25 7:13 UTC (permalink / raw)
To: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ
Cc: linaro-dev-cunTk1MwBs8s++Sfvej+rw, patches-QSEj5FYQhm4dnm+yROfE0A
After fec dt support is added, the following compile error will be
seen when building a pure non-dt kernel.
drivers/net/fec.c: In function ‘fec_probe’:
drivers/net/fec.c:1383: error: implicit declaration of function ‘of_match_device’
drivers/net/fec.c:1383: warning: assignment makes pointer from integer without a cast
This patch is to fix the error.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
drivers/net/fec.c | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index b57f879..ffb1e75 100644
--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c
@@ -85,8 +85,19 @@ static const struct of_device_id fec_dt_ids[] = {
{ .compatible = "fsl,imx51-fec", .data = &fec_devtype[0], },
{},
};
+
+static const struct of_device_id *
+fec_get_of_device_id(struct platform_device *pdev)
+{
+ return of_match_device(fec_dt_ids, &pdev->dev);
+}
#else
#define fec_dt_ids NULL
+static inline struct of_device_id *
+fec_get_of_device_id(struct platform_device *pdev)
+{
+ return NULL;
+}
#endif
static unsigned char macaddr[ETH_ALEN];
@@ -1380,7 +1391,7 @@ fec_probe(struct platform_device *pdev)
struct resource *r;
const struct of_device_id *of_id;
- of_id = of_match_device(fec_dt_ids, &pdev->dev);
+ of_id = fec_get_of_device_id(pdev);
if (of_id)
pdev->id_entry = (struct platform_device_id *)of_id->data;
--
1.7.1
_______________________________________________
devicetree-discuss mailing list
devicetree-discuss@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/devicetree-discuss
^ permalink raw reply related [flat|nested] 6+ messages in thread[parent not found: <1301037238-4031-1-git-send-email-shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>]
* Re: [PATCH] net/fec: fix compile error introduced by dt support [not found] ` <1301037238-4031-1-git-send-email-shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> @ 2011-03-31 16:09 ` Grant Likely [not found] ` <20110331160940.GF26709-e0URQFbLeQY2iJbIjFUEsiwD8/FfD2ys@public.gmane.org> 0 siblings, 1 reply; 6+ messages in thread From: Grant Likely @ 2011-03-31 16:09 UTC (permalink / raw) To: Shawn Guo Cc: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ, linaro-dev-cunTk1MwBs8s++Sfvej+rw, patches-QSEj5FYQhm4dnm+yROfE0A On Fri, Mar 25, 2011 at 03:13:58PM +0800, Shawn Guo wrote: > After fec dt support is added, the following compile error will be > seen when building a pure non-dt kernel. > > drivers/net/fec.c: In function ‘fec_probe’: > drivers/net/fec.c:1383: error: implicit declaration of function ‘of_match_device’ > drivers/net/fec.c:1383: warning: assignment makes pointer from integer without a cast Earlier today I suggested fixing this by adding an empty implementation of of_match_device, but I forgot that an .of_match pointer has been added to struct device for exactly this purpose. You can use that instead. That change is currently in mainline, but it has not been backported to the Linaro 2.6.38 tree (yet). g. > > This patch is to fix the error. > > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> > --- > drivers/net/fec.c | 13 ++++++++++++- > 1 files changed, 12 insertions(+), 1 deletions(-) > > diff --git a/drivers/net/fec.c b/drivers/net/fec.c > index b57f879..ffb1e75 100644 > --- a/drivers/net/fec.c > +++ b/drivers/net/fec.c > @@ -85,8 +85,19 @@ static const struct of_device_id fec_dt_ids[] = { > { .compatible = "fsl,imx51-fec", .data = &fec_devtype[0], }, > {}, > }; > + > +static const struct of_device_id * > +fec_get_of_device_id(struct platform_device *pdev) > +{ > + return of_match_device(fec_dt_ids, &pdev->dev); > +} > #else > #define fec_dt_ids NULL > +static inline struct of_device_id * > +fec_get_of_device_id(struct platform_device *pdev) > +{ > + return NULL; > +} > #endif > > static unsigned char macaddr[ETH_ALEN]; > @@ -1380,7 +1391,7 @@ fec_probe(struct platform_device *pdev) > struct resource *r; > const struct of_device_id *of_id; > > - of_id = of_match_device(fec_dt_ids, &pdev->dev); > + of_id = fec_get_of_device_id(pdev); > if (of_id) > pdev->id_entry = (struct platform_device_id *)of_id->data; > > -- > 1.7.1 > > > _______________________________________________ > linaro-dev mailing list > linaro-dev@lists.linaro.org > http://lists.linaro.org/mailman/listinfo/linaro-dev _______________________________________________ devicetree-discuss mailing list devicetree-discuss@lists.ozlabs.org https://lists.ozlabs.org/listinfo/devicetree-discuss ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <20110331160940.GF26709-e0URQFbLeQY2iJbIjFUEsiwD8/FfD2ys@public.gmane.org>]
* Re: [PATCH] net/fec: fix compile error introduced by dt support [not found] ` <20110331160940.GF26709-e0URQFbLeQY2iJbIjFUEsiwD8/FfD2ys@public.gmane.org> @ 2011-04-01 7:49 ` Shawn Guo [not found] ` <20110401074916.GI25866-+NayF8gZjK2ctlrPMvKcciBecyulp+rMXqFh9Ls21Oc@public.gmane.org> 0 siblings, 1 reply; 6+ messages in thread From: Shawn Guo @ 2011-04-01 7:49 UTC (permalink / raw) To: Grant Likely Cc: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ, linaro-dev-cunTk1MwBs8s++Sfvej+rw, patches-QSEj5FYQhm4dnm+yROfE0A On Thu, Mar 31, 2011 at 10:09:40AM -0600, Grant Likely wrote: > On Fri, Mar 25, 2011 at 03:13:58PM +0800, Shawn Guo wrote: > > After fec dt support is added, the following compile error will be > > seen when building a pure non-dt kernel. > > > > drivers/net/fec.c: In function ‘fec_probe’: > > drivers/net/fec.c:1383: error: implicit declaration of function ‘of_match_device’ > > drivers/net/fec.c:1383: warning: assignment makes pointer from integer without a cast > > Earlier today I suggested fixing this by adding an empty > implementation of of_match_device, but I forgot that an .of_match > pointer has been added to struct device for exactly this purpose. You > can use that instead. > > That change is currently in mainline, but it has not been backported > to the Linaro 2.6.38 tree (yet). > This simply is a fix to commit 54898b86fa9813313b3eb981c44610ff483b0067 "net/fec: add device tree matching support", which only sits on branch devicetree/test-2.6.38 right now. However, .of_match is not available on that tree yet. So I can not do anything until ether this patch shows on devicetree/test or .of_match is back ported on devicetree/test-2.6.38. Or you can simply ignore this patch since I just want let you know such a compile error. -- Regards, Shawn _______________________________________________ linaro-dev mailing list linaro-dev@lists.linaro.org http://lists.linaro.org/mailman/listinfo/linaro-dev ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <20110401074916.GI25866-+NayF8gZjK2ctlrPMvKcciBecyulp+rMXqFh9Ls21Oc@public.gmane.org>]
* Re: [PATCH] net/fec: fix compile error introduced by dt support [not found] ` <20110401074916.GI25866-+NayF8gZjK2ctlrPMvKcciBecyulp+rMXqFh9Ls21Oc@public.gmane.org> @ 2011-04-05 4:54 ` Grant Likely [not found] ` <20110405045400.GA28956-e0URQFbLeQY2iJbIjFUEsiwD8/FfD2ys@public.gmane.org> 0 siblings, 1 reply; 6+ messages in thread From: Grant Likely @ 2011-04-05 4:54 UTC (permalink / raw) To: Shawn Guo Cc: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ, linaro-dev-cunTk1MwBs8s++Sfvej+rw, patches-QSEj5FYQhm4dnm+yROfE0A On Fri, Apr 01, 2011 at 03:49:16PM +0800, Shawn Guo wrote: > On Thu, Mar 31, 2011 at 10:09:40AM -0600, Grant Likely wrote: > > On Fri, Mar 25, 2011 at 03:13:58PM +0800, Shawn Guo wrote: > > > After fec dt support is added, the following compile error will be > > > seen when building a pure non-dt kernel. > > > > > > drivers/net/fec.c: In function ‘fec_probe’: > > > drivers/net/fec.c:1383: error: implicit declaration of function ‘of_match_device’ > > > drivers/net/fec.c:1383: warning: assignment makes pointer from integer without a cast > > > > Earlier today I suggested fixing this by adding an empty > > implementation of of_match_device, but I forgot that an .of_match > > pointer has been added to struct device for exactly this purpose. You > > can use that instead. > > > > That change is currently in mainline, but it has not been backported > > to the Linaro 2.6.38 tree (yet). > > > This simply is a fix to commit 54898b86fa9813313b3eb981c44610ff483b0067 > "net/fec: add device tree matching support", which only sits on branch > devicetree/test-2.6.38 right now. However, .of_match is not available > on that tree yet. So I can not do anything until ether this patch > shows on devicetree/test or .of_match is back ported on > devicetree/test-2.6.38. Or you can simply ignore this patch since I > just want let you know such a compile error. Okay, of_match is in my devicetree/test branch now since I've rebased to 2.6.38-rc1. I'll happily take a fixup patch from you now. :-) g. > > -- > Regards, > Shawn > _______________________________________________ devicetree-discuss mailing list devicetree-discuss@lists.ozlabs.org https://lists.ozlabs.org/listinfo/devicetree-discuss ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <20110405045400.GA28956-e0URQFbLeQY2iJbIjFUEsiwD8/FfD2ys@public.gmane.org>]
* [PATCH v2] net/fec: fix compile error introduced by dt support [not found] ` <20110405045400.GA28956-e0URQFbLeQY2iJbIjFUEsiwD8/FfD2ys@public.gmane.org> @ 2011-05-05 15:18 ` Shawn Guo 2011-05-05 15:20 ` [PATCH] " Shawn Guo 1 sibling, 0 replies; 6+ messages in thread From: Shawn Guo @ 2011-05-05 15:18 UTC (permalink / raw) To: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ Cc: linaro-kerenl-cunTk1MwBs8s++Sfvej+rw, patches-QSEj5FYQhm4dnm+yROfE0A After fec dt support is added, the following compile error will be seen when building a pure non-dt kernel. drivers/net/fec.c: In function ‘fec_probe’: drivers/net/fec.c:1383: error: implicit declaration of function ‘of_match_device’ drivers/net/fec.c:1383: warning: assignment makes pointer from integer without a cast This patch is to fix the error. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> --- Changes since v1: * Use of_match pointer newly added to struct device to fix the error drivers/net/fec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/fec.c b/drivers/net/fec.c index 65112a1..40b2a26 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c @@ -1376,7 +1376,7 @@ fec_probe(struct platform_device *pdev) struct resource *r; const struct of_device_id *of_id; - of_id = of_match_device(fec_dt_ids, &pdev->dev); + of_id = pdev->dev.of_match; if (of_id) pdev->id_entry = (struct platform_device_id *)of_id->data; -- 1.7.4.1 _______________________________________________ devicetree-discuss mailing list devicetree-discuss@lists.ozlabs.org https://lists.ozlabs.org/listinfo/devicetree-discuss ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] net/fec: fix compile error introduced by dt support [not found] ` <20110405045400.GA28956-e0URQFbLeQY2iJbIjFUEsiwD8/FfD2ys@public.gmane.org> 2011-05-05 15:18 ` [PATCH v2] " Shawn Guo @ 2011-05-05 15:20 ` Shawn Guo 1 sibling, 0 replies; 6+ messages in thread From: Shawn Guo @ 2011-05-05 15:20 UTC (permalink / raw) To: Grant Likely Cc: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ, linaro-kernel-cunTk1MwBs8s++Sfvej+rw, patches-QSEj5FYQhm4dnm+yROfE0A On Mon, Apr 04, 2011 at 10:54:00PM -0600, Grant Likely wrote: > On Fri, Apr 01, 2011 at 03:49:16PM +0800, Shawn Guo wrote: > > On Thu, Mar 31, 2011 at 10:09:40AM -0600, Grant Likely wrote: > > > On Fri, Mar 25, 2011 at 03:13:58PM +0800, Shawn Guo wrote: > > > > After fec dt support is added, the following compile error will be > > > > seen when building a pure non-dt kernel. > > > > > > > > drivers/net/fec.c: In function ‘fec_probe’: > > > > drivers/net/fec.c:1383: error: implicit declaration of function ‘of_match_device’ > > > > drivers/net/fec.c:1383: warning: assignment makes pointer from integer without a cast > > > > > > Earlier today I suggested fixing this by adding an empty > > > implementation of of_match_device, but I forgot that an .of_match > > > pointer has been added to struct device for exactly this purpose. You > > > can use that instead. > > > > > > That change is currently in mainline, but it has not been backported > > > to the Linaro 2.6.38 tree (yet). > > > > > This simply is a fix to commit 54898b86fa9813313b3eb981c44610ff483b0067 > > "net/fec: add device tree matching support", which only sits on branch > > devicetree/test-2.6.38 right now. However, .of_match is not available > > on that tree yet. So I can not do anything until ether this patch > > shows on devicetree/test or .of_match is back ported on > > devicetree/test-2.6.38. Or you can simply ignore this patch since I > > just want let you know such a compile error. > > Okay, of_match is in my devicetree/test branch now since I've rebased > to 2.6.38-rc1. I'll happily take a fixup patch from you now. :-) > Sorry, Grant. I overlooked this reply, and noticed it when re-visiting the thread today. I just sent an updated patch. Please take a look. -- Regards, Shawn _______________________________________________ devicetree-discuss mailing list devicetree-discuss@lists.ozlabs.org https://lists.ozlabs.org/listinfo/devicetree-discuss ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-05-05 15:20 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-25 7:13 [PATCH] net/fec: fix compile error introduced by dt support Shawn Guo
[not found] ` <1301037238-4031-1-git-send-email-shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2011-03-31 16:09 ` Grant Likely
[not found] ` <20110331160940.GF26709-e0URQFbLeQY2iJbIjFUEsiwD8/FfD2ys@public.gmane.org>
2011-04-01 7:49 ` Shawn Guo
[not found] ` <20110401074916.GI25866-+NayF8gZjK2ctlrPMvKcciBecyulp+rMXqFh9Ls21Oc@public.gmane.org>
2011-04-05 4:54 ` Grant Likely
[not found] ` <20110405045400.GA28956-e0URQFbLeQY2iJbIjFUEsiwD8/FfD2ys@public.gmane.org>
2011-05-05 15:18 ` [PATCH v2] " Shawn Guo
2011-05-05 15:20 ` [PATCH] " Shawn Guo
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).