summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2019-04-09 12:24:49 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2019-04-09 12:24:49 +0200
commit0272ec9ca9fe43a5d57a603093dc6787e6a3a7e4 (patch)
treeeca186b6730cb539003f21a5081c4bd575551a36 /drivers
parent383b3cb658f99f3fd9aea3fe94e9060e895a7568 (diff)
parent426b4de76c0a7df7be447af5931a869d14926c34 (diff)
downloadbarebox-0272ec9ca9fe43a5d57a603093dc6787e6a3a7e4.tar.gz
Merge branch 'for-next/warnings'
Diffstat (limited to 'drivers')
-rw-r--r--drivers/bus/mvebu-mbus.c2
-rw-r--r--drivers/clk/mvebu/common.c4
-rw-r--r--drivers/clk/mxs/clk-imx23.c2
-rw-r--r--drivers/clk/mxs/clk-imx28.c2
-rw-r--r--drivers/clocksource/mvebu.c2
-rw-r--r--drivers/mfd/lp3972.c1
-rw-r--r--drivers/net/mvneta.c2
-rw-r--r--drivers/usb/otg/twl4030.c2
-rw-r--r--drivers/w1/slaves/w1_ds2431.c2
9 files changed, 10 insertions, 9 deletions
diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c
index 965a221..4b7edb5 100644
--- a/drivers/bus/mvebu-mbus.c
+++ b/drivers/bus/mvebu-mbus.c
@@ -436,7 +436,7 @@ orion5x_4win_mbus_data __maybe_unused = {
};
static const struct mvebu_mbus_soc_data
-orion5x_2win_mbus_data__maybe_unused = {
+orion5x_2win_mbus_data __maybe_unused = {
.num_wins = 8,
.num_remappable_wins = 2,
.win_cfg_offset = orion5x_mbus_win_offset,
diff --git a/drivers/clk/mvebu/common.c b/drivers/clk/mvebu/common.c
index f6f118f..609e636 100644
--- a/drivers/clk/mvebu/common.c
+++ b/drivers/clk/mvebu/common.c
@@ -42,7 +42,7 @@ static struct of_device_id mvebu_coreclk_ids[] = {
{ }
};
-int mvebu_coreclk_probe(struct device_d *dev)
+static int mvebu_coreclk_probe(struct device_d *dev)
{
struct resource *iores;
struct device_node *np = dev->device_node;
@@ -155,7 +155,7 @@ static struct of_device_id mvebu_clk_gating_ids[] = {
{ }
};
-int mvebu_clk_gating_probe(struct device_d *dev)
+static int mvebu_clk_gating_probe(struct device_d *dev)
{
struct resource *iores;
struct device_node *np = dev->device_node;
diff --git a/drivers/clk/mxs/clk-imx23.c b/drivers/clk/mxs/clk-imx23.c
index e28dae1..526efc5 100644
--- a/drivers/clk/mxs/clk-imx23.c
+++ b/drivers/clk/mxs/clk-imx23.c
@@ -61,7 +61,7 @@ enum imx23_clk {
static struct clk *clks[clk_max];
-int __init mx23_clocks_init(void __iomem *regs)
+static int __init mx23_clocks_init(void __iomem *regs)
{
clks[ref_xtal] = mxs_clk_fixed("ref_xtal", 24000000);
clks[pll] = mxs_clk_pll("pll", "ref_xtal", PLLCTRL0, 16, 480000000);
diff --git a/drivers/clk/mxs/clk-imx28.c b/drivers/clk/mxs/clk-imx28.c
index dd17a74..12bc9dd 100644
--- a/drivers/clk/mxs/clk-imx28.c
+++ b/drivers/clk/mxs/clk-imx28.c
@@ -74,7 +74,7 @@ enum imx28_clk {
static struct clk *clks[clk_max];
-int __init mx28_clocks_init(void __iomem *regs)
+static int __init mx28_clocks_init(void __iomem *regs)
{
clks[ref_xtal] = clk_fixed("ref_xtal", 24000000);
clks[pll0] = mxs_clk_pll("pll0", "ref_xtal", PLL0CTRL0, 17, 480000000);
diff --git a/drivers/clocksource/mvebu.c b/drivers/clocksource/mvebu.c
index 59bbc4b..b55d72a 100644
--- a/drivers/clocksource/mvebu.c
+++ b/drivers/clocksource/mvebu.c
@@ -43,7 +43,7 @@
static __iomem void *timer_base;
-uint64_t mvebu_clocksource_read(void)
+static uint64_t mvebu_clocksource_read(void)
{
return 0 - __raw_readl(timer_base + TIMER0_VAL_OFF);
}
diff --git a/drivers/mfd/lp3972.c b/drivers/mfd/lp3972.c
index 3ae9d1a..ca73671 100644
--- a/drivers/mfd/lp3972.c
+++ b/drivers/mfd/lp3972.c
@@ -20,6 +20,7 @@
#include <driver.h>
#include <xfuncs.h>
#include <errno.h>
+#include <mfd/lp3972.h>
#include <i2c/i2c.h>
diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c
index 7aa54a2..359c70c 100644
--- a/drivers/net/mvneta.c
+++ b/drivers/net/mvneta.c
@@ -580,7 +580,7 @@ static void mvneta_init_rx_ring(struct mvneta_port *priv)
priv->curr_rxdesc = 0;
}
-void mvneta_setup_tx_rx(struct mvneta_port *priv)
+static void mvneta_setup_tx_rx(struct mvneta_port *priv)
{
u32 val;
diff --git a/drivers/usb/otg/twl4030.c b/drivers/usb/otg/twl4030.c
index fd5f593..3668870 100644
--- a/drivers/usb/otg/twl4030.c
+++ b/drivers/usb/otg/twl4030.c
@@ -64,7 +64,7 @@ static int twl4030_usb_read(u8 address)
return ret;
}
-void twl4030_power_init(void)
+static void twl4030_power_init(void)
{
unsigned char byte;
struct twl4030 *twl4030 = twl4030_get();
diff --git a/drivers/w1/slaves/w1_ds2431.c b/drivers/w1/slaves/w1_ds2431.c
index 6446f4b..ab2ceff 100644
--- a/drivers/w1/slaves/w1_ds2431.c
+++ b/drivers/w1/slaves/w1_ds2431.c
@@ -60,7 +60,7 @@ static inline size_t ds2431_fix_count(loff_t off, size_t count, size_t size)
*
* count must not exceed W1_F2D_READ_MAXLEN.
*/
-int ds2431_readblock(struct w1_device *dev, int off, int count, char *buf)
+static int ds2431_readblock(struct w1_device *dev, int off, int count, char *buf)
{
struct w1_bus *bus = dev->bus;
u8 wrbuf[3];