diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-04-07 09:59:29 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-04-07 09:59:29 +0200 |
commit | 011aec6558e93b01c64202929a6ae90a334a3742 (patch) | |
tree | 65c8ff6fbb7b16bfa1a0a6c9ba8b09f3ba4df43d | |
parent | 5204fb1264037917733abe5f7611e2d5e4cb411e (diff) | |
parent | f43a576673950a5f9ccfc78ddde80098c1da849d (diff) | |
download | barebox-011aec6558e93b01c64202929a6ae90a334a3742.tar.gz barebox-011aec6558e93b01c64202929a6ae90a334a3742.tar.xz |
Merge branch 'for-next/mips'
-rw-r--r-- | drivers/clk/clk-gate-shared.c | 6 | ||||
-rw-r--r-- | include/gui/image_renderer.h | 2 | ||||
-rw-r--r-- | lib/gui/bmp.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/clk/clk-gate-shared.c b/drivers/clk/clk-gate-shared.c index a95f940dd2..c3b678a311 100644 --- a/drivers/clk/clk-gate-shared.c +++ b/drivers/clk/clk-gate-shared.c @@ -69,8 +69,8 @@ static struct clk_ops clk_gate_shared_ops = { .is_enabled = clk_gate_shared_is_enabled, }; -struct clk *clk_gate_shared_alloc(const char *name, const char *parent, const char *companion, - unsigned flags) +static struct clk *clk_gate_shared_alloc(const char *name, const char *parent, + const char *companion, unsigned flags) { struct clk_gate_shared *g = xzalloc(sizeof(*g)); @@ -86,7 +86,7 @@ struct clk *clk_gate_shared_alloc(const char *name, const char *parent, const ch return &g->clk; } -void clk_gate_shared_free(struct clk *clk) +static void clk_gate_shared_free(struct clk *clk) { struct clk_gate_shared *g = to_clk_gate_shared(clk); diff --git a/include/gui/image_renderer.h b/include/gui/image_renderer.h index e0b1eae258..bfdea1b14e 100644 --- a/include/gui/image_renderer.h +++ b/include/gui/image_renderer.h @@ -32,7 +32,7 @@ struct image_renderer { #ifdef CONFIG_IMAGE_RENDERER int image_renderer_register(struct image_renderer *ir); -void image_render_unregister(struct image_renderer *ir); +void image_renderer_unregister(struct image_renderer *ir); int image_renderer_image(struct screen *sc, struct surface *s, struct image *img); diff --git a/lib/gui/bmp.c b/lib/gui/bmp.c index 143aa28055..8bffc70a42 100644 --- a/lib/gui/bmp.c +++ b/lib/gui/bmp.c @@ -9,7 +9,7 @@ #include <gui/image_renderer.h> #include <asm/unaligned.h> -struct image *bmp_open(char *inbuf, int insize) +static struct image *bmp_open(char *inbuf, int insize) { struct image *img = calloc(1, sizeof(struct image)); struct bmp_image *bmp = (struct bmp_image*)inbuf; @@ -30,7 +30,7 @@ struct image *bmp_open(char *inbuf, int insize) return img; } -void bmp_close(struct image *img) +static void bmp_close(struct image *img) { free(img->data); } |