dw_mmc: cleanups
PATCH 1/1 dw_mmc: cleanups
dw_mmc driver was responding to errors with debug(). Change that to prinf so that any errors are immediately obvious. Also adjust english in comments.
drivers/mmc/dw_mmc.c +13 -11
@@ -177,14 +177,16 @@ static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, } } -if (i == retry) +if (i == retry) { +printf ("dwmci_send_cmd: timeout..\n" );return TIMEOUT ; + }if (mask &DWMCI_INTMSK_RTO ) { -debug ("Response Timeout..\n" ); +printf ("dwmci_send_cmd: Response Timeout..\n" );return TIMEOUT ; }else if (mask &DWMCI_INTMSK_RE ) { -debug ("Response Error..\n" ); +printf ("dwmci_send_cmd: Response Error..\n" );return -1 ; }
@@ -204,7 +206,7 @@ static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd,do { mask =dwmci_readl (host,DWMCI_RINTSTS );if (mask & (DWMCI_DATA_ERR |DWMCI_DATA_TOUT )) { -debug ("DATA ERROR!\n" ); +printf ("dwmci_send_cmd: DATA ERROR!\n" );return -1 ; } }while (!(mask &DWMCI_INTMSK_DTO ));
@@ -232,16 +234,16 @@ static int dwmci_setup_bus(struct dwmci_host *host, u32 freq)if ((freq == host->clock) || (freq ==0 ))return 0 ;/* -* If host->get_mmc_clk didn't define, +* If host->get_mmc_clk isn't defined, * then assume that host->bus_hz is source clock value. -* host->bus_hz should be set from user. +* host->bus_hz should be set by user. */ if (host->get_mmc_clk) sclk = host->get_mmc_clk (host);else if (host->bus_hz) sclk = host->bus_hz;else { -printf ("Didn't get source clock value..\n" ); +printf ("dwmci_setup_bus: Didn't get source clock value..\n" );return -EINVAL ; }
@@ -260,7 +262,7 @@ static int dwmci_setup_bus(struct dwmci_host *host, u32 freq)do { status =dwmci_readl (host,DWMCI_CMD );if (timeout-- <0 ) { -printf ("TIMEOUT error!!\n" ); +printf ("dwmci_setup_bus: timeout!\n" );return -ETIMEDOUT ; } }while (status &DWMCI_CMD_START );
@@ -275,7 +277,7 @@ static int dwmci_setup_bus(struct dwmci_host *host, u32 freq)do { status =dwmci_readl (host,DWMCI_CMD );if (timeout-- <0 ) { -printf ("TIMEOUT error!!\n" ); +printf ("dwmci_setup_bus: timeout!\n" );return -ETIMEDOUT ; } }while (status &DWMCI_CMD_START );
@@ -290,7 +292,7 @@ static void dwmci_set_ios(struct mmc *mmc)struct dwmci_host *host = (struct dwmci_host *)mmc->priv;u32 ctype, regs; -debug ("Buswidth = %d, clock: %d\n" ,mmc->bus_width, mmc->clock); +debug ("Buswidth = %d, clock: %d\n" , mmc->bus_width, mmc->clock);dwmci_setup_bus (host, mmc->clock);switch (mmc->bus_width) {
@@ -329,7 +331,7 @@ static int dwmci_init(struct mmc *mmc)dwmci_writel (host,DWMCI_PWREN ,1 );if (!dwmci_wait_reset (host,DWMCI_RESET_ALL )) { -debug ("%s[%d] Fail-reset!!\n" ,__func__,__LINE__); +printf ("%s[%d] Fail-reset!!\n" , __func__, __LINE__);return -1 ; }
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
PATCH 1/1 dw_mmc: cleanups
Quoted 11 lines · Pavel Machek
dw_mmcdriver was responding to errors withdebug(). Change that to prinf so that any errors are immediately obvious. Also adjust english in comments.Signed-off-by Pavel Machek <[email protected]>drivers/mmc/dw_mmc.c +0
-0
drivers/mmc/dw_mmc.c static int dwmci_send_cmd(struct mmc *mmc, struct · line 181
Quoted 6 lines
drivers/mmc/dw_mmc.c +2
-1@@ -177,14 +177,16 @@ static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, } } -if (i == retry) +if (i == retry) { +printf ("dwmci_send_cmd: timeout..\n" );
puts(), please fix globally.
[...]
Best regards,
Marek Vasut
PATCH 1/1 dw_mmc: cleanups
Quoted 15 lines · Marek Vasut
Quoted 14 lines · Pavel Machek
dw_mmcdriver was responding to errors withdebug(). Change that to prinf so that any errors are immediately obvious. Also adjust english in comments.Signed-off-by Pavel Machek <[email protected]>drivers/mmc/dw_mmc.c +0
-0@@ -177,14 +177,16 @@ static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, } }
Quoted 5 lines
drivers/mmc/dw_mmc.c static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, · line 181
Quoted 3 lines
drivers/mmc/dw_mmc.c +2
-1-if (i == retry) +if (i == retry) { +printf ("dwmci_send_cmd: timeout..\n" );
puts(), please fix globally.
Won't.
printf() is canonical way of printing, and is used in such way at 1000 places in u-boot.
But feel free to prepare patchv2 yourself if you think it is worth the effort.
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
PATCH 1/1 dw_mmc: cleanups
Quoted 23 lines · Pavel Machek
Quoted 14 lines · Marek Vasut
Quoted 13 lines · Pavel Machek
dw_mmcdriver was responding to errors withdebug(). Change that to prinf so that any errors are immediately obvious. Also adjust english in comments.Signed-off-by Pavel Machek <[email protected]>drivers/mmc/dw_mmc.c +0
-0@@ -177,14 +177,16 @@ static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, }Quoted 7 lines
drivers/mmc/dw_mmc.c static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, · line 181
Quoted 5 lines
drivers/mmc/dw_mmc.c +2
-1} -if (i == retry) +if (i == retry) { +printf ("dwmci_send_cmd: timeout..\n" );
puts(), please fix globally.
Quoted 4 lines
Won't.
printf()is canonical way of printing, and is used in such way at 1000 places in u-boot.
The agreement is to use puts() when there are no args attached to the print, so that the code size is reduced.
Best regards,
Marek Vasut
PATCH 1/1 dw_mmc: cleanups
Quoted 24 lines · Marek Vasut
Quoted 23 lines · Pavel Machek
Quoted 21 lines · Marek Vasut
Quoted 11 lines · Pavel Machek
dw_mmcdriver was responding to errors withdebug(). Change that to prinf so that any errors are immediately obvious. Also adjust english in comments.Signed-off-by Pavel Machek <[email protected]>drivers/mmc/dw_mmc.c +0
-0drivers/mmc/dw_mmc.c static int dwmci_send_cmd(struct mmc *mmc, struct · line 182
Quoted 7 lines
drivers/mmc/dw_mmc.c +2
-1@@ -177,14 +177,16 @@ static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, } } -if (i == retry) +if (i == retry) { +printf ("dwmci_send_cmd: timeout..\n" );
puts(), please fix globally.
Quoted 7 lines
Quoted 4 lines
Won't.
printf()is canonical way of printing, and is used in such way at 1000 places in u-boot.The agreement is to use
puts()when there are no args attached to the print, so that the code size is reduced.
I did not make such agreement with you, and don't think obfuscating code with printf->puts conversion is a good idea. If there's codingstyle document I missed somewhere, please point me to it.
If you think global conversion is a good idea, please do it, so that old code does not serve as a bad example. But I don't think it saves any size, compared to speed of serial line it does not save any time, either.
Pavel
PS: Sorry for flames on the mailing list, but marex explicitely asked me to take discussion there.
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
PATCH 1/1 dw_mmc: cleanups
In reply to Pavel MachekHi, Pavel.
It looks good to me.
If you're ok, can i suggest one thing?
Quoted 70 lines · Pavel Machek
dw_mmcdriver was responding to errors withdebug(). Change that to prinf so that any errors are immediately obvious. Also adjust english in comments.Signed-off-by Pavel Machek <[email protected]>drivers/mmc/dw_mmc.c +10
-8@@ -177,14 +177,16 @@ static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, } } -if (i == retry) +if (i == retry) { +printf ("dwmci_send_cmd: timeout..\n" );return TIMEOUT ; + }if (mask &DWMCI_INTMSK_RTO ) { -debug ("Response Timeout..\n" ); +printf ("dwmci_send_cmd: Response Timeout..\n" );return TIMEOUT ; }else if (mask &DWMCI_INTMSK_RE ) { -debug ("Response Error..\n" ); +printf ("dwmci_send_cmd: Response Error..\n" );return -1 ; }@@ -204,7 +206,7 @@ static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd,do { mask =dwmci_readl (host,DWMCI_RINTSTS );if (mask & (DWMCI_DATA_ERR |DWMCI_DATA_TOUT )) { -debug ("DATA ERROR!\n" ); +printf ("dwmci_send_cmd: DATA ERROR!\n" );return -1 ; } }while (!(mask &DWMCI_INTMSK_DTO ));@@ -232,16 +234,16 @@ static int dwmci_setup_bus(struct dwmci_host *host, u32 freq)if ((freq == host->clock) || (freq ==0 ))return 0 ;/* -* If host->get_mmc_clk didn't define, +* If host->get_mmc_clk isn't defined, * then assume that host->bus_hz is source clock value. -* host->bus_hz should be set from user. +* host->bus_hz should be set by user. */ if (host->get_mmc_clk) sclk = host->get_mmc_clk (host);else if (host->bus_hz) sclk = host->bus_hz;else { -printf ("Didn't get source clock value..\n" ); +printf ("dwmci_setup_bus: Didn't get source clock value..\n" );return -EINVAL ; }@@ -260,7 +262,7 @@ static int dwmci_setup_bus(struct dwmci_host *host, u32 freq)do { status =dwmci_readl (host,DWMCI_CMD );if (timeout-- <0 ) { -printf ("TIMEOUT error!!\n" ); +printf ("dwmci_setup_bus: timeout!\n" );return -ETIMEDOUT ; } }while (status &DWMCI_CMD_START );
drivers/mmc/dw_mmc.c static int dwmci_setup_bus(struct dwmci_host *host, u32 freq) · line 280
Quoted 5 lines
drivers/mmc/dw_mmc.c +1
-1@@ -275,7 +277,7 @@ static int dwmci_setup_bus(struct dwmci_host *host, u32 freq) do { status = dwmci_readl(host, DWMCI_CMD); if (timeout-- < 0) { - printf("TIMEOUT error!!\n"); + printf("dwmci_setup_bus: timeout!\n");
According to your the main purpose, this patch is goal that noticed where/what error is occurred. Then i think good that add the "__LINE__".
Because there are same message like "dwmci_setup_bus: tiemout!\n" at some place.
Then i think we don't need to discuss about this patch with Marek. :)
Best Regards,
Jaehoon Chung
Quoted 22 lines
drivers/mmc/dw_mmc.c +2
-2return -ETIMEDOUT ; } }while (status &DWMCI_CMD_START );@@ -290,7 +292,7 @@ static void dwmci_set_ios(struct mmc *mmc)struct dwmci_host *host = (struct dwmci_host *)mmc->priv;u32 ctype, regs; -debug ("Buswidth = %d, clock: %d\n" ,mmc->bus_width, mmc->clock); +debug ("Buswidth = %d, clock: %d\n" , mmc->bus_width, mmc->clock);dwmci_setup_bus (host, mmc->clock);switch (mmc->bus_width) {@@ -329,7 +331,7 @@ static int dwmci_init(struct mmc *mmc)dwmci_writel (host,DWMCI_PWREN ,1 );if (!dwmci_wait_reset (host,DWMCI_RESET_ALL )) { -debug ("%s[%d] Fail-reset!!\n" ,__func__,__LINE__); +printf ("%s[%d] Fail-reset!!\n" , __func__, __LINE__);return -1 ; }
PATCH 1/1 dw_mmc: cleanups
Hi,
Quoted 36 lines · Jaehoon Chung
Hi, Pavel.
It looks good to me.
If you're ok, can i suggest one thing?Quoted 21 lines · Pavel Machek
dw_mmcdriver was responding to errors withdebug(). Change that to prinf so that any errors are immediately obvious. Also adjust english in comments.Signed-off-by Pavel Machek <[email protected]>drivers/mmc/dw_mmc.c +1
-1@@ -260,7 +262,7 @@ static int dwmci_setup_bus(struct dwmci_host *host, u32 freq)do { status =dwmci_readl (host,DWMCI_CMD );if (timeout-- <0 ) { -printf ("TIMEOUT error!!\n" ); +printf ("dwmci_setup_bus: timeout!\n" );return -ETIMEDOUT ; } }while (status &DWMCI_CMD_START );drivers/mmc/dw_mmc.c static int dwmci_setup_bus(struct dwmci_host *host, u32 freq) · line 280
Quoted 5 lines
drivers/mmc/dw_mmc.c +1
-1@@ -275,7 +277,7 @@ static int dwmci_setup_bus(struct dwmci_host *host, u32 freq) do { status = dwmci_readl(host, DWMCI_CMD); if (timeout-- < 0) { - printf("TIMEOUT error!!\n"); + printf("dwmci_setup_bus: timeout!\n");According to your the main purpose, this patch is goal that noticed where/what error is occurred. Then i think good that add the "
__LINE__".
Because there are same message like "dwmci_setup_bus: tiemout!\n" at some place.
Quoted 2 lines
Then i think we don't need to discuss about this patch with Marek. :)
This patch looks good except need to distinguish the error location as pointed by Jaehoon.
Thanks
Chin Liang
Quoted 3 lines
Best Regards,
Jaehoon Chung