Merge branch 'for-next/misc'

7 files changed, 14 insertions, 15 deletions

diff --git a/drivers/i2c/i2c.c b/drivers/i2c/i2c.c
index 7a6bde0f67..5d0fa06bb5 100644
--- a/drivers/i2c/i2c.c
+++ b/drivers/i2c/i2c.c
@@ -183,7 +183,7 @@ int i2c_read_reg(struct i2c_client *client, u32 addr, u8 *buf, u16 count)
 	msg->len = i;
 
 	status = i2c_transfer(client->adapter, msg, ARRAY_SIZE(msg));
-	dev_dbg(&client->dev, "%s: %zu@%u --> %d\n", __func__,
+	dev_dbg(&client->dev, "%s: %u@%u --> %d\n", __func__,
 		count, addr, status);
 
 	if (status == ARRAY_SIZE(msg))
diff --git a/drivers/mtd/core.c b/drivers/mtd/core.c
index 1755e7680f..681dc9313c 100644
--- a/drivers/mtd/core.c
+++ b/drivers/mtd/core.c
@@ -191,7 +191,7 @@ static int mtd_op_erase(struct cdev *cdev, size_t count, loff_t offset)
 	return 0;
 }
 
-static ssize_t mtd_op_protect(struct cdev *cdev, size_t count, loff_t offset, int prot)
+static int mtd_op_protect(struct cdev *cdev, size_t count, loff_t offset, int prot)
 {
 	struct mtd_info *mtd = cdev->priv;
 
diff --git a/drivers/mtd/nand/nand-bb.c b/drivers/mtd/nand/nand-bb.c
index 539c685482..8e4600ab03 100644
--- a/drivers/mtd/nand/nand-bb.c
+++ b/drivers/mtd/nand/nand-bb.c
@@ -54,7 +54,7 @@ static ssize_t nand_bb_read(struct cdev *cdev, void *buf, size_t count,
 	size_t retlen;
 	int ret, bytes = 0, now;
 
-	debug("%s offset: 0x%08llx (raw: 0x%08llx) count: 0x%08x\n",
+	debug("%s offset: 0x%08llx (raw: 0x%08llx) count: 0x%08zx\n",
 			__func__, offset, bb->offset, count);
 
 	while (count) {
@@ -132,7 +132,7 @@ static ssize_t nand_bb_write(struct cdev *cdev, const void *buf, size_t count,
 	struct nand_bb *bb = cdev->priv;
 	int bytes = count, now, wroffs, ret;
 
-	debug("%s offset: 0x%08llx (raw: 0x%08llx) count: 0x%08x\n",
+	debug("%s offset: 0x%08llx (raw: 0x%08llx) count: 0x%08zx\n",
 			__func__, offset, bb->offset, count);
 
 	while (count) {
diff --git a/drivers/mtd/nor/cfi_flash.h b/drivers/mtd/nor/cfi_flash.h
index 9aad5c41f6..aeaf751aba 100644
--- a/drivers/mtd/nor/cfi_flash.h
+++ b/drivers/mtd/nor/cfi_flash.h
@@ -256,17 +256,17 @@ void flash_make_cmd(struct flash_info *info, u32 cmd, cfiword_t *cmdbuf);
 
 static inline void flash_write8(u8 value, void *addr)
 {
-	cpu_writeb(value, addr);
+	__raw_writeb(value, addr);
 }
 
 static inline void flash_write16(u16 value, void *addr)
 {
-	cpu_writew(value, addr);
+	__raw_writew(value, addr);
 }
 
 static inline void flash_write32(u32 value, void *addr)
 {
-	cpu_writel(value, addr);
+	__raw_writel(value, addr);
 }
 
 static inline void flash_write64(u64 value, void *addr)
@@ -276,17 +276,17 @@ static inline void flash_write64(u64 value, void *addr)
 
 static inline u8 flash_read8(void *addr)
 {
-	return cpu_readb(addr);
+	return __raw_readb(addr);
 }
 
 static inline u16 flash_read16(void *addr)
 {
-	return cpu_readw(addr);
+	return __raw_readw(addr);
 }
 
 static inline u32 flash_read32(void *addr)
 {
-	return cpu_readl(addr);
+	return __raw_readl(addr);
 }
 
 static inline u64 flash_read64(void *addr)
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index dfa95c38c8..88f0523260 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -48,7 +48,6 @@ static inline char *dt_string(struct fdt_header *f, char *strstart, uint32_t ofs
 
 /**
  * of_unflatten_dtb - unflatten a dtb binary blob
- * @root - node in which the fdt blob should be merged into or NULL
  * @infdt - the fdt blob to unflatten
  *
  * Parse a flat device tree binary blob and return a pointer to the
diff --git a/drivers/serial/serial_ar933x.c b/drivers/serial/serial_ar933x.c
index 51184aaae5..59bb5b2ecf 100644
--- a/drivers/serial/serial_ar933x.c
+++ b/drivers/serial/serial_ar933x.c
@@ -40,7 +40,7 @@ static inline void ar933x_serial_writel(struct console_device *cdev,
 {
 	struct ar933x_uart_priv *priv = cdev->dev->priv;
 
-	cpu_writel(b, priv->base + offset);
+	__raw_writel(b, priv->base + offset);
 }
 
 static inline u32 ar933x_serial_readl(struct console_device *cdev,
@@ -48,7 +48,7 @@ static inline u32 ar933x_serial_readl(struct console_device *cdev,
 {
 	struct ar933x_uart_priv *priv = cdev->dev->priv;
 
-	return cpu_readl(priv->base + offset);
+	return __raw_readl(priv->base + offset);
 }
 
 /*
diff --git a/drivers/spi/ath79_spi.c b/drivers/spi/ath79_spi.c
index 4d71eba695..bdb39ef0cb 100644
--- a/drivers/spi/ath79_spi.c
+++ b/drivers/spi/ath79_spi.c
@@ -48,12 +48,12 @@ struct ath79_spi {
 
 static inline u32 ath79_spi_rr(struct ath79_spi *sp, int reg)
 {
-	return cpu_readl(sp->regs + reg);
+	return __raw_readl(sp->regs + reg);
 }
 
 static inline void ath79_spi_wr(struct ath79_spi *sp, u32 val, int reg)
 {
-	cpu_writel(val, sp->regs + reg);
+	__raw_writel(val, sp->regs + reg);
 }
 
 static inline void setbits(struct ath79_spi *sp, int bits, int on)