mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Lucas Stach <l.stach@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 3/5] video: ipu-fb: mark internally used functions as static
Date: Fri, 14 Aug 2015 12:16:43 +0200	[thread overview]
Message-ID: <1439547405-12578-3-git-send-email-l.stach@pengutronix.de> (raw)
In-Reply-To: <1439547405-12578-1-git-send-email-l.stach@pengutronix.de>

Fixes symbol clashes with the IPUv3 driver:
In function `ipu_ch_param_write_field':
drivers/video/imx-ipu-v3/ipu-common.c:103: multiple definition of `ipu_ch_param_write_field'
drivers/video/imx-ipu-fb.c:359: first defined here

In function `ipu_cpmem_set_format_rgb':
drivers/video/imx-ipu-v3/ipu-common.c:155: multiple definition of `ipu_cpmem_set_format_rgb'
drivers/video/imx-ipu-fb.c:504: first defined here

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 drivers/video/imx-ipu-fb.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/video/imx-ipu-fb.c b/drivers/video/imx-ipu-fb.c
index b56658202c5f..a87e720d9615 100644
--- a/drivers/video/imx-ipu-fb.c
+++ b/drivers/video/imx-ipu-fb.c
@@ -355,7 +355,8 @@ struct ipu_ch_param {
 	struct ipu_cpmem_word word[2];
 };
 
-void ipu_ch_param_write_field(struct ipu_ch_param __iomem *base, u32 wbs, u32 v)
+static void ipu_ch_param_write_field(struct ipu_ch_param __iomem *base,
+				     u32 wbs, u32 v)
 {
 	u32 bit = (wbs >> 8) % 160;
 	u32 size = wbs & 0xff;
@@ -500,7 +501,8 @@ static int sdc_init_panel(struct fb_info *info, enum disp_data_mapping fmt)
 	return 0;
 }
 
-int ipu_cpmem_set_format_rgb(struct ipu_ch_param *p, struct imx_ipu_fb_rgb *rgb)
+static int ipu_cpmem_set_format_rgb(struct ipu_ch_param *p,
+				    struct imx_ipu_fb_rgb *rgb)
 {
 	int bpp = 0, npb = 0, ro, go, bo, to;
 
-- 
2.4.6


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2015-08-14 10:17 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-14 10:16 [PATCH 1/5] video: simple-panel: depend on GPIOLIB Lucas Stach
2015-08-14 10:16 ` [PATCH 2/5] video: mtl017: " Lucas Stach
2015-08-14 10:16 ` Lucas Stach [this message]
2015-08-19 13:49   ` [PATCH 3/5] video: ipu-fb: mark internally used functions as static Sascha Hauer
2015-08-14 10:16 ` [PATCH 4/5] video: fbcon: needs console support Lucas Stach
2015-08-19 13:50   ` Sascha Hauer
2015-08-14 10:16 ` [PATCH 5/5] ARM: imx6: select OFTREE Lucas Stach
2015-08-19 13:52   ` Sascha Hauer
2015-08-19 13:48 ` [PATCH 1/5] video: simple-panel: depend on GPIOLIB Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1439547405-12578-3-git-send-email-l.stach@pengutronix.de \
    --to=l.stach@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox