Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1550744

[PATCH] mmc: dw_mmc: Fix some coding style

Show all headers | View raw

Let's fix the warnings from checkpatch.pl:

- line over 80 characters;
- block comments should align the * on each Lines;
- statements not starting on a tabstop.

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
---

 drivers/mmc/host/dw_mmc.c | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index ed63237..a8efe3f 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -94,7 +94,8 @@ struct idmac_desc {
 
 	__le32		des1;	/* Buffer sizes */
 #define IDMAC_SET_BUFFER1_SIZE(d, s) \
-	((d)->des1 = ((d)->des1 & cpu_to_le32(0x03ffe000)) | (cpu_to_le32((s) & 0x1fff)))
+	((d)->des1 = ((d)->des1 & cpu_to_le32(0x03ffe000)) | \
+	 (cpu_to_le32((s) & 0x1fff)))
 
 	__le32		des2;	/* buffer 1 physical address */
 
@@ -2733,16 +2734,16 @@ static void dw_mci_init_dma(struct dw_mci *host)
 	struct device_node *np = dev->of_node;
 
 	/*
-	* Check tansfer mode from HCON[17:16]
-	* Clear the ambiguous description of dw_mmc databook:
-	* 2b'00: No DMA Interface -> Actually means using Internal DMA block
-	* 2b'01: DesignWare DMA Interface -> Synopsys DW-DMA block
-	* 2b'10: Generic DMA Interface -> non-Synopsys generic DMA block
-	* 2b'11: Non DW DMA Interface -> pio only
-	* Compared to DesignWare DMA Interface, Generic DMA Interface has a
-	* simpler request/acknowledge handshake mechanism and both of them
-	* are regarded as external dma master for dw_mmc.
-	*/
+	 * Check tansfer mode from HCON[17:16]
+	 * Clear the ambiguous description of dw_mmc databook:
+	 * 2b'00: No DMA Interface -> Actually means using Internal DMA block
+	 * 2b'01: DesignWare DMA Interface -> Synopsys DW-DMA block
+	 * 2b'10: Generic DMA Interface -> non-Synopsys generic DMA block
+	 * 2b'11: Non DW DMA Interface -> pio only
+	 * Compared to DesignWare DMA Interface, Generic DMA Interface has a
+	 * simpler request/acknowledge handshake mechanism and both of them
+	 * are regarded as external dma master for dw_mmc.
+	 */
 	host->use_dma = SDMMC_GET_TRANS_MODE(mci_readl(host, HCON));
 	if (host->use_dma == DMA_INTERFACE_IDMA) {
 		host->use_dma = TRANS_MODE_IDMAC;
@@ -2756,9 +2757,9 @@ static void dw_mci_init_dma(struct dw_mci *host)
 	/* Determine which DMA interface to use */
 	if (host->use_dma == TRANS_MODE_IDMAC) {
 		/*
-		* Check ADDR_CONFIG bit in HCON to find
-		* IDMAC address bus width
-		*/
+		 * Check ADDR_CONFIG bit in HCON to find
+		 * IDMAC address bus width
+		 */
 		addr_config = SDMMC_GET_ADDR_CONFIG(mci_readl(host, HCON));
 
 		if (addr_config == 1) {
@@ -3337,8 +3338,8 @@ int dw_mci_runtime_resume(struct device *dev)
 	 * Restore the initial value at FIFOTH register
 	 * And Invalidate the prev_blksz with zero
 	 */
-	 mci_writel(host, FIFOTH, host->fifoth_val);
-	 host->prev_blksz = 0;
+	mci_writel(host, FIFOTH, host->fifoth_val);
+	host->prev_blksz = 0;
 
 	/* Put in max timeout */
 	mci_writel(host, TMOUT, 0xFFFFFFFF);
-- 
2.7.4

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] mmc: dw_mmc: Fix some coding style Ziyuan Xu <xzy.xu@rock-chips.com> - 2017-01-04 14:00 +0100
  Re: [PATCH] mmc: dw_mmc: Fix some coding style Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-01-04 14:20 +0100
  Re: [PATCH] mmc: dw_mmc: Fix some coding style Joe Perches <joe@perches.com> - 2017-01-04 19:40 +0100
    Re: [PATCH] mmc: dw_mmc: Fix some coding style Ziyuan <xzy.xu@rock-chips.com> - 2017-01-05 08:40 +0100
  Re: [PATCH] mmc: dw_mmc: Fix some coding style Jaehoon Chung <jh80.chung@samsung.com> - 2017-01-05 02:30 +0100
    Re: [PATCH] mmc: dw_mmc: Fix some coding style Shawn Lin <shawn.lin@rock-chips.com> - 2017-01-05 03:40 +0100

csiph-web