Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 783b437a authored by H. Nikolaus Schaller's avatar H. Nikolaus Schaller Committed by Greg Kroah-Hartman
Browse files

w1: omap-hdq: cleanup to add missing newline for some dev_dbg 



commit 5e02f3b31704e24537697bce54f8156bdb72b7a6 upstream.

Otherwise it will corrupt the console log during debugging.

Fixes: 7b5362a6 ("w1: omap_hdq: Fix some error/debug handling.")
Cc: stable@vger.kernel.org
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarH. Nikolaus Schaller <hns@goldelico.com>
Link: https://lore.kernel.org/r/cd0d55749a091214106575f6e1d363c6db56622f.1590255176.git.hns@goldelico.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 49f44baf

drivers/w1/masters/omap_hdq.c

+5 −5
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static int hdq_write_byte(struct hdq_data *hdq_data, u8 val, u8 *status) 
	/* check irqstatus */

	if (!(*status & OMAP_HDQ_INT_STATUS_TXCOMPLETE)) {

		dev_dbg(hdq_data->dev, "timeout waiting for"

			" TXCOMPLETE/RXCOMPLETE, %x", *status);

			" TXCOMPLETE/RXCOMPLETE, %x\n", *status);

		ret = -ETIMEDOUT;

		goto out;

	}
@@ -187,7 +187,7 @@ static int hdq_write_byte(struct hdq_data *hdq_data, u8 val, u8 *status) 
			OMAP_HDQ_FLAG_CLEAR, &tmp_status);

	if (ret) {

		dev_dbg(hdq_data->dev, "timeout waiting GO bit"

			" return to zero, %x", tmp_status);

			" return to zero, %x\n", tmp_status);

	}



out:
@@ -203,7 +203,7 @@ static irqreturn_t hdq_isr(int irq, void *_hdq) 
	spin_lock_irqsave(&hdq_data->hdq_spinlock, irqflags);

	hdq_data->hdq_irqstatus = hdq_reg_in(hdq_data, OMAP_HDQ_INT_STATUS);

	spin_unlock_irqrestore(&hdq_data->hdq_spinlock, irqflags);

	dev_dbg(hdq_data->dev, "hdq_isr: %x", hdq_data->hdq_irqstatus);

	dev_dbg(hdq_data->dev, "hdq_isr: %x\n", hdq_data->hdq_irqstatus);



	if (hdq_data->hdq_irqstatus &

		(OMAP_HDQ_INT_STATUS_TXCOMPLETE | OMAP_HDQ_INT_STATUS_RXCOMPLETE
@@ -311,7 +311,7 @@ static int omap_hdq_break(struct hdq_data *hdq_data) 
	tmp_status = hdq_data->hdq_irqstatus;

	/* check irqstatus */

	if (!(tmp_status & OMAP_HDQ_INT_STATUS_TIMEOUT)) {

		dev_dbg(hdq_data->dev, "timeout waiting for TIMEOUT, %x",

		dev_dbg(hdq_data->dev, "timeout waiting for TIMEOUT, %x\n",

				tmp_status);

		ret = -ETIMEDOUT;

		goto out;
@@ -338,7 +338,7 @@ static int omap_hdq_break(struct hdq_data *hdq_data) 
			&tmp_status);

	if (ret)

		dev_dbg(hdq_data->dev, "timeout waiting INIT&GO bits"

			" return to zero, %x", tmp_status);

			" return to zero, %x\n", tmp_status);



out:

	mutex_unlock(&hdq_data->hdq_mutex);