diff mbox

mmc: dw_mmc: Fix some coding style

Message ID 1483534376-6521-1-git-send-email-xzy.xu@rock-chips.com (mailing list archive)
State New, archived
Headers show

Commit Message

ziyuan Jan. 4, 2017, 12:52 p.m. UTC
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(-)

Comments

Andy Shevchenko Jan. 4, 2017, 1:03 p.m. UTC | #1
On Wed, Jan 4, 2017 at 2:52 PM, Ziyuan Xu <xzy.xu@rock-chips.com> wrote:
> 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.

>         __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)))

I don't think there is a significant value to split. How many
characters it fits right now?
Up to 90 for such a code is okay for my point of view. It makes it
more readable than split variant.
Joe Perches Jan. 4, 2017, 6:32 p.m. UTC | #2
On Wed, 2017-01-04 at 20:52 +0800, Ziyuan Xu wrote:
> 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
[]
> @@ -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)))

Please look to improve code rather than just shut up
the brainless checkpatch script.

If this is really valuable, it'd probably be better as
an inline function, or as it's only used once, just
as direct code in that one place.

--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jaehoon Chung Jan. 5, 2017, 1:19 a.m. UTC | #3
Hi,

On 01/04/2017 09:52 PM, Ziyuan Xu wrote:
> 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.

If there is no critical problem, 
I think that current codes are keeping better than changing.
When someone contribute the patches relevant to these, it can be also changed,
(It's more meaningful.)

Best Regards,
Jaehoon Chung

> 
> 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);
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Shawn Lin Jan. 5, 2017, 2:24 a.m. UTC | #4
On 2017/1/5 9:19, Jaehoon Chung wrote:
> Hi,
>
> On 01/04/2017 09:52 PM, Ziyuan Xu wrote:
>> 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.
>
> If there is no critical problem,
> I think that current codes are keeping better than changing.
> When someone contribute the patches relevant to these, it can be also changed,
> (It's more meaningful.)
>

Indeed.

Moreover, it breaks the git-blame history when we need to review
how the code had been developing..


> Best Regards,
> Jaehoon Chung
>
>>
>> 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);
>>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
ziyuan Jan. 5, 2017, 7:30 a.m. UTC | #5
On 01/05/2017 02:32 AM, Joe Perches wrote:
> On Wed, 2017-01-04 at 20:52 +0800, Ziyuan Xu wrote:
>> 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
> []
>> @@ -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)))
> Please look to improve code rather than just shut up
> the brainless checkpatch script.
>
> If this is really valuable, it'd probably be better as
> an inline function, or as it's only used once, just
> as direct code in that one place.

Fine, I get it. Thanks for the advice.:-)

>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
>
>


--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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);