* [PATCH Resend] of: fix a build error to f_graph_get_endpoint_by_regs function
@ 2015-06-23 7:06 Inki Dae
[not found] ` <1435043204-23133-1-git-send-email-inki.dae-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
0 siblings, 1 reply; 3+ messages in thread
From: Inki Dae @ 2015-06-23 7:06 UTC (permalink / raw)
To: devicetree, robh+dt
Cc: mark.rutland, sfr, pawel.moll, ijc+devicetree, dri-devel, galak
This patch fixes the below build error reported by Stephen,
Stephen reported:
After merging the drm-exynos tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/media/i2c/adv7604.o: In function `of_graph_get_endpoint_by_regs':
adv7604.c:(.text+0x586c): multiple definition of `of_graph_get_endpoint_by_regs'
drivers/media/i2c/adv7343.o:adv7343.c:(.text+0xa13): first defined here
drivers/media/platform/soc_camera/atmel-isi.o: In function `of_graph_get_endpoint_by_regs':
atmel-isi.c:(.text+0x1ec9): multiple definition of `of_graph_get_endpoint_by_regs'
drivers/media/platform/soc_camera/soc_camera.o:soc_camera.c:(.text+0x2ce3): first defined here
drivers/media/platform/soc_camera/rcar_vin.o: In function `of_graph_get_endpoint_by_regs':
rcar_vin.c:(.text+0x307c): multiple definition of `of_graph_get_endpoint_by_regs'
drivers/media/platform/soc_camera/soc_camera.o:soc_camera.c:(.text+0x2ce3): first defined here
Caused by commit:
a0f7001c18ca ("of: add helper for getting endpoint node of specific identifiers")
To fix the error, this patch declares of_graph_get_endpoint_by_regs function
with "static inline".
Signed-off-by: Inki Dae <inki.dae@samsung.com>
---
include/linux/of_graph.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/of_graph.h b/include/linux/of_graph.h
index 1c1d5b9..f8bcd0e 100644
--- a/include/linux/of_graph.h
+++ b/include/linux/of_graph.h
@@ -71,7 +71,7 @@ static inline struct device_node *of_graph_get_next_endpoint(
return NULL;
}
-struct device_node *of_graph_get_endpoint_by_regs(
+static inline struct device_node *of_graph_get_endpoint_by_regs(
const struct device_node *parent, int port_reg, int reg)
{
return NULL;
--
1.7.9.5
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH Resend] of: fix a build error to f_graph_get_endpoint_by_regs function
[not found] ` <1435043204-23133-1-git-send-email-inki.dae-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
@ 2015-06-23 13:57 ` Rob Herring
2015-06-23 18:27 ` Stephen Rothwell
1 sibling, 0 replies; 3+ messages in thread
From: Rob Herring @ 2015-06-23 13:57 UTC (permalink / raw)
To: Inki Dae
Cc: devicetree-u79uwXL29TY76Z2rM5mHXA, Rob Herring, dri-devel,
Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, David Airlie,
Stephen Rothwell
On Tue, Jun 23, 2015 at 2:06 AM, Inki Dae <inki.dae-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> wrote:
> This patch fixes the below build error reported by Stephen,
>
> Stephen reported:
> After merging the drm-exynos tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/media/i2c/adv7604.o: In function `of_graph_get_endpoint_by_regs':
> adv7604.c:(.text+0x586c): multiple definition of `of_graph_get_endpoint_by_regs'
> drivers/media/i2c/adv7343.o:adv7343.c:(.text+0xa13): first defined here
> drivers/media/platform/soc_camera/atmel-isi.o: In function `of_graph_get_endpoint_by_regs':
> atmel-isi.c:(.text+0x1ec9): multiple definition of `of_graph_get_endpoint_by_regs'
> drivers/media/platform/soc_camera/soc_camera.o:soc_camera.c:(.text+0x2ce3): first defined here
> drivers/media/platform/soc_camera/rcar_vin.o: In function `of_graph_get_endpoint_by_regs':
> rcar_vin.c:(.text+0x307c): multiple definition of `of_graph_get_endpoint_by_regs'
> drivers/media/platform/soc_camera/soc_camera.o:soc_camera.c:(.text+0x2ce3): first defined here
>
> Caused by commit:
> a0f7001c18ca ("of: add helper for getting endpoint node of specific identifiers")
>
> To fix the error, this patch declares of_graph_get_endpoint_by_regs function
> with "static inline".
>
> Signed-off-by: Inki Dae <inki.dae-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> ---
> include/linux/of_graph.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/linux/of_graph.h b/include/linux/of_graph.h
> index 1c1d5b9..f8bcd0e 100644
> --- a/include/linux/of_graph.h
> +++ b/include/linux/of_graph.h
> @@ -71,7 +71,7 @@ static inline struct device_node *of_graph_get_next_endpoint(
> return NULL;
> }
>
> -struct device_node *of_graph_get_endpoint_by_regs(
> +static inline struct device_node *of_graph_get_endpoint_by_regs(
> const struct device_node *parent, int port_reg, int reg)
> {
> return NULL;
> --
> 1.7.9.5
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH Resend] of: fix a build error to f_graph_get_endpoint_by_regs function
[not found] ` <1435043204-23133-1-git-send-email-inki.dae-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
2015-06-23 13:57 ` Rob Herring
@ 2015-06-23 18:27 ` Stephen Rothwell
1 sibling, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2015-06-23 18:27 UTC (permalink / raw)
To: Inki Dae, airlied-cv59FeDIM0c
Cc: devicetree-u79uwXL29TY76Z2rM5mHXA,
robh+dt-DgEjT+Ai2ygdnm+yROfE0A,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
pawel.moll-5wv7dgnIgG8, mark.rutland-5wv7dgnIgG8,
ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg,
galak-sgV2jX0FEOL9JmXXK+q4OQ
[-- Attachment #1: Type: text/plain, Size: 2063 bytes --]
Hi Dave,
On Tue, 23 Jun 2015 16:06:44 +0900 Inki Dae <inki.dae-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> wrote:
>
> This patch fixes the below build error reported by Stephen,
>
> Stephen reported:
> After merging the drm-exynos tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/media/i2c/adv7604.o: In function `of_graph_get_endpoint_by_regs':
> adv7604.c:(.text+0x586c): multiple definition of `of_graph_get_endpoint_by_regs'
> drivers/media/i2c/adv7343.o:adv7343.c:(.text+0xa13): first defined here
> drivers/media/platform/soc_camera/atmel-isi.o: In function `of_graph_get_endpoint_by_regs':
> atmel-isi.c:(.text+0x1ec9): multiple definition of `of_graph_get_endpoint_by_regs'
> drivers/media/platform/soc_camera/soc_camera.o:soc_camera.c:(.text+0x2ce3): first defined here
> drivers/media/platform/soc_camera/rcar_vin.o: In function `of_graph_get_endpoint_by_regs':
> rcar_vin.c:(.text+0x307c): multiple definition of `of_graph_get_endpoint_by_regs'
> drivers/media/platform/soc_camera/soc_camera.o:soc_camera.c:(.text+0x2ce3): first defined here
>
> Caused by commit:
> a0f7001c18ca ("of: add helper for getting endpoint node of specific identifiers")
>
> To fix the error, this patch declares of_graph_get_endpoint_by_regs function
> with "static inline".
>
> Signed-off-by: Inki Dae <inki.dae-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
In case it is not obvious, this is needed in the drm tree now.
However, you seem to have been sent a rebased version of the drm-exynos
tree and so the commit referred to above is commit 8ccd0d0ca041 in your
tree. :-(
Inki, please clean up your tree now that Dave has merged a rebased
version of it (and please do *not* rebase your tree before asking Dave
to merge it in the future - or if you must do that, then also update
the branch that I include in linux-next first).
--
Cheers,
Stephen Rothwell sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-06-23 18:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-23 7:06 [PATCH Resend] of: fix a build error to f_graph_get_endpoint_by_regs function Inki Dae
[not found] ` <1435043204-23133-1-git-send-email-inki.dae-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
2015-06-23 13:57 ` Rob Herring
2015-06-23 18:27 ` Stephen Rothwell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.