hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

i2c: aspeed: Add newline characters into message printings. 

There are some log printing without a newline character. This
patch adds the missing newline characters.

Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
Reviewed-by: Brendan Higgins <brendanhiggins@google.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Jae Hyun Yoo 2018-07-02 14:13:59 -07:00 committed by Wolfram Sang
parent eebfd44399
commit 6bc33c5197
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/i2c/busses/i2c-aspeed.c
View File

@ -407,7 +407,7 @@ static bool aspeed_i2c_master_irq(struct aspeed_i2c_bus *bus)
*/ */
ret = aspeed_i2c_is_irq_error(irq_status); ret = aspeed_i2c_is_irq_error(irq_status);
if (ret < 0) { if (ret < 0) {
dev_dbg(bus->dev, "received error interrupt: 0x%08x", dev_dbg(bus->dev, "received error interrupt: 0x%08x\n",
irq_status); irq_status);
bus->cmd_err = ret; bus->cmd_err = ret;
bus->master_state = ASPEED_I2C_MASTER_INACTIVE; bus->master_state = ASPEED_I2C_MASTER_INACTIVE;
@ -416,7 +416,7 @@ static bool aspeed_i2c_master_irq(struct aspeed_i2c_bus *bus)
/* We are in an invalid state; reset bus to a known state. */ /* We are in an invalid state; reset bus to a known state. */
if (!bus->msgs) { if (!bus->msgs) {
dev_err(bus->dev, "bus in unknown state"); dev_err(bus->dev, "bus in unknown state\n");
bus->cmd_err = -EIO; bus->cmd_err = -EIO;
if (bus->master_state != ASPEED_I2C_MASTER_STOP) if (bus->master_state != ASPEED_I2C_MASTER_STOP)
aspeed_i2c_do_stop(bus); aspeed_i2c_do_stop(bus);
@ -431,7 +431,7 @@ static bool aspeed_i2c_master_irq(struct aspeed_i2c_bus *bus)
*/ */
if (bus->master_state == ASPEED_I2C_MASTER_START) { if (bus->master_state == ASPEED_I2C_MASTER_START) {
if (unlikely(!(irq_status & ASPEED_I2CD_INTR_TX_ACK))) { if (unlikely(!(irq_status & ASPEED_I2CD_INTR_TX_ACK))) {
pr_devel("no slave present at %02x", msg->addr); pr_devel("no slave present at %02x\n", msg->addr);
status_ack |= ASPEED_I2CD_INTR_TX_NAK; status_ack |= ASPEED_I2CD_INTR_TX_NAK;
bus->cmd_err = -ENXIO; bus->cmd_err = -ENXIO;
aspeed_i2c_do_stop(bus); aspeed_i2c_do_stop(bus);
@ -451,11 +451,11 @@ static bool aspeed_i2c_master_irq(struct aspeed_i2c_bus *bus)
switch (bus->master_state) { switch (bus->master_state) {
case ASPEED_I2C_MASTER_TX: case ASPEED_I2C_MASTER_TX:
if (unlikely(irq_status & ASPEED_I2CD_INTR_TX_NAK)) { if (unlikely(irq_status & ASPEED_I2CD_INTR_TX_NAK)) {
dev_dbg(bus->dev, "slave NACKed TX"); dev_dbg(bus->dev, "slave NACKed TX\n");
status_ack |= ASPEED_I2CD_INTR_TX_NAK; status_ack |= ASPEED_I2CD_INTR_TX_NAK;
goto error_and_stop; goto error_and_stop;
} else if (unlikely(!(irq_status & ASPEED_I2CD_INTR_TX_ACK))) { } else if (unlikely(!(irq_status & ASPEED_I2CD_INTR_TX_ACK))) {
dev_err(bus->dev, "slave failed to ACK TX"); dev_err(bus->dev, "slave failed to ACK TX\n");
goto error_and_stop; goto error_and_stop;
} }
status_ack |= ASPEED_I2CD_INTR_TX_ACK; status_ack |= ASPEED_I2CD_INTR_TX_ACK;
@ -478,7 +478,7 @@ static bool aspeed_i2c_master_irq(struct aspeed_i2c_bus *bus)
/* fallthrough intended */ /* fallthrough intended */
case ASPEED_I2C_MASTER_RX: case ASPEED_I2C_MASTER_RX:
if (unlikely(!(irq_status & ASPEED_I2CD_INTR_RX_DONE))) { if (unlikely(!(irq_status & ASPEED_I2CD_INTR_RX_DONE))) {
dev_err(bus->dev, "master failed to RX"); dev_err(bus->dev, "master failed to RX\n");
goto error_and_stop; goto error_and_stop;
} }
status_ack |= ASPEED_I2CD_INTR_RX_DONE; status_ack |= ASPEED_I2CD_INTR_RX_DONE;
@ -509,7 +509,7 @@ static bool aspeed_i2c_master_irq(struct aspeed_i2c_bus *bus)
goto out_no_complete; goto out_no_complete;
case ASPEED_I2C_MASTER_STOP: case ASPEED_I2C_MASTER_STOP:
if (unlikely(!(irq_status & ASPEED_I2CD_INTR_NORMAL_STOP))) { if (unlikely(!(irq_status & ASPEED_I2CD_INTR_NORMAL_STOP))) {
dev_err(bus->dev, "master failed to STOP"); dev_err(bus->dev, "master failed to STOP\n");
bus->cmd_err = -EIO; bus->cmd_err = -EIO;
/* Do not STOP as we have already tried. */ /* Do not STOP as we have already tried. */
} else { } else {
@ -520,7 +520,7 @@ static bool aspeed_i2c_master_irq(struct aspeed_i2c_bus *bus)
goto out_complete; goto out_complete;
case ASPEED_I2C_MASTER_INACTIVE: case ASPEED_I2C_MASTER_INACTIVE:
dev_err(bus->dev, dev_err(bus->dev,
"master received interrupt 0x%08x, but is inactive", "master received interrupt 0x%08x, but is inactive\n",
irq_status); irq_status);
bus->cmd_err = -EIO; bus->cmd_err = -EIO;
/* Do not STOP as we should be inactive. */ /* Do not STOP as we should be inactive. */
@ -851,7 +851,7 @@ static int aspeed_i2c_probe_bus(struct platform_device *pdev)
bus->rst = devm_reset_control_get_shared(&pdev->dev, NULL); bus->rst = devm_reset_control_get_shared(&pdev->dev, NULL);
if (IS_ERR(bus->rst)) { if (IS_ERR(bus->rst)) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"missing or invalid reset controller device tree entry"); "missing or invalid reset controller device tree entry\n");
return PTR_ERR(bus->rst); return PTR_ERR(bus->rst);
} }
reset_control_deassert(bus->rst); reset_control_deassert(bus->rst);