Merge branch 'for-next/misc'

8 files changed, 24 insertions, 10 deletions

diff --git a/drivers/i2c/busses/i2c-imx-early.c b/drivers/i2c/busses/i2c-imx-early.c
index 26922c1044..472e4be83a 100644
--- a/drivers/i2c/busses/i2c-imx-early.c
+++ b/drivers/i2c/busses/i2c-imx-early.c
@@ -282,7 +282,7 @@ fail0:
 	i2c_fsl_stop(fsl_i2c);
 
 	/* Disable I2C controller, and force our state to stopped */
-	temp = fsl_i2c->i2cr_ien_opcode ^ I2CR_IEN,
+	temp = fsl_i2c->i2cr_ien_opcode ^ I2CR_IEN;
 	fsl_i2c_write_reg(temp, fsl_i2c, FSL_I2C_I2CR);
 
 	return (ret < 0) ? ret : num;
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index 6911f803b2..7d25ed3af5 100644
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -511,7 +511,7 @@ fail0:
 	i2c_fsl_stop(adapter);
 
 	/* Disable I2C controller, and force our state to stopped */
-	temp = i2c_fsl->hwdata->i2cr_ien_opcode ^ I2CR_IEN,
+	temp = i2c_fsl->hwdata->i2cr_ien_opcode ^ I2CR_IEN;
 	fsl_i2c_write_reg(temp, i2c_fsl, FSL_I2C_I2CR);
 
 	return (result < 0) ? result : num;
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index bdb34ca1b4..d3f525f333 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -1176,7 +1176,7 @@ i2c_omap_probe(struct device_d *pdev)
 
 	omap_i2c_idle(i2c_omap);
 
-	i2c_omap->adapter.master_xfer = omap_i2c_xfer,
+	i2c_omap->adapter.master_xfer = omap_i2c_xfer;
 	i2c_omap->adapter.nr = pdev->id;
 	i2c_omap->adapter.dev.parent = pdev;
 	i2c_omap->adapter.dev.device_node = pdev->device_node;
diff --git a/drivers/mci/stm32_sdmmc2.c b/drivers/mci/stm32_sdmmc2.c
index 3ce3bb0f89..da2dc592ad 100644
--- a/drivers/mci/stm32_sdmmc2.c
+++ b/drivers/mci/stm32_sdmmc2.c
@@ -586,8 +586,8 @@ static int stm32_sdmmc2_probe(struct amba_device *adev,
 	priv->dev = dev;
 
 	mci = &priv->mci;
-	mci->send_cmd = stm32_sdmmc2_send_cmd,
-	mci->set_ios = stm32_sdmmc2_set_ios,
+	mci->send_cmd = stm32_sdmmc2_send_cmd;
+	mci->set_ios = stm32_sdmmc2_set_ios;
 	mci->init = stm32_sdmmc2_reset;
 	mci->hw_dev = dev;
 
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 406b8c964f..7397034586 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -198,11 +198,11 @@ int usbnet_probe(struct usb_device *usbdev, const struct usb_device_id *prod)
 	edev = &undev->edev;
 	undev->udev = usbdev;
 
-	edev->open = usbnet_open,
-	edev->init = usbnet_init,
-	edev->send = usbnet_send,
-	edev->recv = usbnet_recv,
-	edev->halt = usbnet_halt,
+	edev->open = usbnet_open;
+	edev->init = usbnet_init;
+	edev->send = usbnet_send;
+	edev->recv = usbnet_recv;
+	edev->halt = usbnet_halt;
 	edev->priv = undev;
 	edev->parent = &usbdev->dev;
 
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c
index 0751c52513..865ecdddb2 100644
--- a/drivers/serial/amba-pl011.c
+++ b/drivers/serial/amba-pl011.c
@@ -204,6 +204,7 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
 	cdev->putc = pl011_putc;
 	cdev->getc = pl011_getc;
 	cdev->setbrg = pl011_setbaudrate;
+	cdev->linux_console_name = "ttyAMA";
 
 	pl011_init_port(cdev);
 
diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c
index 5d6cec82a4..f117ab9dc1 100644
--- a/drivers/serial/serial_ns16550.c
+++ b/drivers/serial/serial_ns16550.c
@@ -308,6 +308,17 @@ static int ns16550_tstc(struct console_device *cdev)
 	return ((ns16550_read(cdev, lsr) & LSR_DR) != 0);
 }
 
+/**
+ * @brief Flush remaining characters in serial device
+ *
+ * @param[in] cdev pointer to console device
+ */
+static void ns16550_flush(struct console_device *cdev)
+{
+	/* Loop Doing Nothing */
+	while ((ns16550_read(cdev, lsr) & LSR_TEMT) == 0) ;
+}
+
 static void ns16550_probe_dt(struct device_d *dev, struct ns16550_priv *priv)
 {
 	struct device_node *np = dev->device_node;
@@ -501,6 +512,7 @@ static int ns16550_probe(struct device_d *dev)
 	cdev->putc = ns16550_putc;
 	cdev->getc = ns16550_getc;
 	cdev->setbrg = ns16550_setbaudrate;
+	cdev->flush = ns16550_flush;
 	cdev->linux_console_name = devtype->linux_console_name;
 
 	priv->fcrval = FCRVAL;
diff --git a/drivers/serial/stm-serial.c b/drivers/serial/stm-serial.c
index ea482415ce..a2c3dcf56e 100644
--- a/drivers/serial/stm-serial.c
+++ b/drivers/serial/stm-serial.c
@@ -159,6 +159,7 @@ static int stm_serial_probe(struct device_d *dev)
 	cdev->flush = stm_serial_flush;
 	cdev->setbrg = stm_serial_setbaudrate;
 	cdev->dev = dev;
+	cdev->linux_console_name = "ttyAMA";
 
 	dev->priv = priv;
 	iores = dev_request_mem_resource(dev, 0);