[PATCH] bus: bt1-apb: Eliminate a duplicate header file
Delete one of two same header files included in drivers/bus/bt1-apb.c Signed-off-by: Chen Jiahao --- drivers/bus/bt1-apb.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/bus/bt1-apb.c b/drivers/bus/bt1-apb.c index b25ff941e7c7..74b1b712ef3a 100644 --- a/drivers/bus/bt1-apb.c +++ b/drivers/bus/bt1-apb.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #define APB_EHB_ISR0x00 -- 2.17.1
[PATCH] f2fs/checkpoint: fix a spacing coding style
Add a space before the plus. Signed-off-by: jiahao --- fs/f2fs/checkpoint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c index 897edb7..26dbefd 100644 --- a/fs/f2fs/checkpoint.c +++ b/fs/f2fs/checkpoint.c @@ -1456,7 +1456,7 @@ static int do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc) orphan_blocks); if (__remain_node_summaries(cpc->reason)) - ckpt->cp_pack_total_block_count = cpu_to_le32(F2FS_CP_PACKS+ + ckpt->cp_pack_total_block_count = cpu_to_le32(F2FS_CP_PACKS + cp_payload_blks + data_sum_blocks + orphan_blocks + NR_CURSEG_NODE_TYPE); else -- 2.7.4
[PATCH] kernel: exit.c: fix a spacing coding style
Add some spaces before and after the operator. Signed-off-by: jiahao --- kernel/exit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/exit.c b/kernel/exit.c index 04029e3..ffc507e 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -888,7 +888,7 @@ EXPORT_SYMBOL(complete_and_exit); SYSCALL_DEFINE1(exit, int, error_code) { - do_exit((error_code&0xff)<<8); + do_exit((error_code & 0xff) << 8); } /* -- 2.7.4
[PATCH] kernel: exit: fix a spacing coding style
Add some spaces before and after the operator. Signed-off-by: jiahao --- kernel/exit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/exit.c b/kernel/exit.c index 733e80f..a3c831c 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -869,7 +869,7 @@ EXPORT_SYMBOL(complete_and_exit); SYSCALL_DEFINE1(exit, int, error_code) { - do_exit((error_code&0xff)<<8); + do_exit((error_code & 0xff) << 8); } /* -- 2.7.4
[PATCH] xhci: Fix log mistake of xhci_start
It is obvious that XCHI_MAX_HALT_USEC is usec, not milliseconds; Replace 'milliseconds' with 'usec' of the debug message. Signed-off-by: jiahao --- drivers/usb/host/xhci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index bee5dec..d011472 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -147,7 +147,7 @@ int xhci_start(struct xhci_hcd *xhci) STS_HALT, 0, XHCI_MAX_HALT_USEC); if (ret == -ETIMEDOUT) xhci_err(xhci, "Host took too long to start, " - "waited %u microseconds.\n", + "waited %u usec.\n", XHCI_MAX_HALT_USEC); if (!ret) /* clear state flags. Including dying, halted or removing */ -- 2.7.4