[U-Boot] [PATCH] common: fixed linker-list example
Last argument shouldn't be there.
Change-Id: Ie227f4bee2c542b15c1a7089894532366ec89a1d Signed-off-by: Mateusz Zalega m.zalega@samsung.com Acked-by: Marek Vasut marex@denx.de Cc: Tom Rini trini@ti.com --- Detached from earlier "DFU, MMC, Gadget, Goni, misc." series because of lack of relevance to other patches.
There were no changes since the first version of this patch. --- include/linker_lists.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linker_lists.h b/include/linker_lists.h index 997d149..557e627 100644 --- a/include/linker_lists.h +++ b/include/linker_lists.h @@ -228,7 +228,7 @@ * and it's name. * * Example: - * ll_entry_declare(struct my_sub_cmd, my_sub_cmd, cmd_sub, cmd.sub) = { + * ll_entry_declare(struct my_sub_cmd, my_sub_cmd, cmd_sub) = { * .x = 3, * .y = 4, * };
mmc_init() doesn't call get_timer() anymore if MMC is already initialized.
Change-Id: Iec694abe3315d146d35dc130ad80b73dffd0983b Signed-off-by: Mateusz Zalega m.zalega@samsung.com Cc: Pantelis Antoniou panto@antoniou-consulting.com --- Detached from earlier "DFU, MMC, Gadget, Goni, misc." series because of lack of relevance to other patches.
There were no changes since the first version of this patch. --- drivers/mmc/mmc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 16051e5..c93dc24 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1310,15 +1310,18 @@ static int mmc_complete_init(struct mmc *mmc) int mmc_init(struct mmc *mmc) { int err = IN_PROGRESS; - unsigned start = get_timer(0); + unsigned start;
if (mmc->has_init) return 0; + + start = get_timer(0); + if (!mmc->init_in_progress) err = mmc_start_init(mmc); - if (!err || err == IN_PROGRESS) err = mmc_complete_init(mmc); + debug("%s: %d, time %lu\n", __func__, err, get_timer(start)); return err; }
Hi Mateusz,
Looks good. I'll apply it.
On Apr 29, 2014, at 8:16 PM, Mateusz Zalega wrote:
mmc_init() doesn't call get_timer() anymore if MMC is already initialized.
Change-Id: Iec694abe3315d146d35dc130ad80b73dffd0983b Signed-off-by: Mateusz Zalega m.zalega@samsung.com Cc: Pantelis Antoniou panto@antoniou-consulting.com
Detached from earlier "DFU, MMC, Gadget, Goni, misc." series because of lack of relevance to other patches.
There were no changes since the first version of this patch.
drivers/mmc/mmc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 16051e5..c93dc24 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1310,15 +1310,18 @@ static int mmc_complete_init(struct mmc *mmc) int mmc_init(struct mmc *mmc) { int err = IN_PROGRESS;
- unsigned start = get_timer(0);
unsigned start;
if (mmc->has_init) return 0;
start = get_timer(0);
if (!mmc->init_in_progress) err = mmc_start_init(mmc);
- if (!err || err == IN_PROGRESS) err = mmc_complete_init(mmc);
- debug("%s: %d, time %lu\n", __func__, err, get_timer(start)); return err;
}
1.9.0
mmc_init() doesn't call get_timer() anymore if MMC is already initialized.
Signed-off-by: Mateusz Zalega m.zalega@samsung.com Cc: Pantelis Antoniou panto@antoniou-consulting.com --- Detached from earlier "DFU, MMC, Gadget, Goni, misc." series because of lack of relevance to other patches.
v2: - deleted change-id line from commit message, sorry! --- drivers/mmc/mmc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 16051e5..c93dc24 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1310,15 +1310,18 @@ static int mmc_complete_init(struct mmc *mmc) int mmc_init(struct mmc *mmc) { int err = IN_PROGRESS; - unsigned start = get_timer(0); + unsigned start;
if (mmc->has_init) return 0; + + start = get_timer(0); + if (!mmc->init_in_progress) err = mmc_start_init(mmc); - if (!err || err == IN_PROGRESS) err = mmc_complete_init(mmc); + debug("%s: %d, time %lu\n", __func__, err, get_timer(start)); return err; }
Hi Pantelis,
mmc_init() doesn't call get_timer() anymore if MMC is already initialized.
Signed-off-by: Mateusz Zalega m.zalega@samsung.com Cc: Pantelis Antoniou panto@antoniou-consulting.com
Detached from earlier "DFU, MMC, Gadget, Goni, misc." series because of lack of relevance to other patches.
v2:
- deleted change-id line from commit message, sorry!
drivers/mmc/mmc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 16051e5..c93dc24 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1310,15 +1310,18 @@ static int mmc_complete_init(struct mmc *mmc) int mmc_init(struct mmc *mmc) { int err = IN_PROGRESS;
- unsigned start = get_timer(0);
unsigned start;
if (mmc->has_init) return 0;
start = get_timer(0);
if (!mmc->init_in_progress) err = mmc_start_init(mmc);
- if (!err || err == IN_PROGRESS) err = mmc_complete_init(mmc);
- debug("%s: %d, time %lu\n", __func__, err, get_timer(start)); return err;
}
Would you find some time to review this patch?
Hi Mateusz,
On Apr 29, 2014, at 9:15 PM, Mateusz Zalega wrote:
mmc_init() doesn't call get_timer() anymore if MMC is already initialized.
Signed-off-by: Mateusz Zalega m.zalega@samsung.com Cc: Pantelis Antoniou panto@antoniou-consulting.com
Detached from earlier "DFU, MMC, Gadget, Goni, misc." series because of lack of relevance to other patches.
v2:
- deleted change-id line from commit message, sorry!
drivers/mmc/mmc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 16051e5..c93dc24 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1310,15 +1310,18 @@ static int mmc_complete_init(struct mmc *mmc) int mmc_init(struct mmc *mmc) { int err = IN_PROGRESS;
- unsigned start = get_timer(0);
unsigned start;
if (mmc->has_init) return 0;
start = get_timer(0);
if (!mmc->init_in_progress) err = mmc_start_init(mmc);
- if (!err || err == IN_PROGRESS) err = mmc_complete_init(mmc);
^ some extra formatting here that's not needed; I'll fix it and apply.
I am curious what the problem was the problem with getting the timer?
debug("%s: %d, time %lu\n", __func__, err, get_timer(start)); return err; } -- 1.9.0
Applied
Thanks
-- Pantelis
Acked-by: Pantelis Antoniou panto@antoniou-consulting.com
Last argument shouldn't be there.
Signed-off-by: Mateusz Zalega m.zalega@samsung.com Acked-by: Marek Vasut marex@denx.de Cc: Tom Rini trini@ti.com --- Detached from earlier "DFU, MMC, Gadget, Goni, misc." series because of lack of relevance to other patches.
v2: - deleted change-id line from commit message, sorry! --- include/linker_lists.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linker_lists.h b/include/linker_lists.h index 997d149..557e627 100644 --- a/include/linker_lists.h +++ b/include/linker_lists.h @@ -228,7 +228,7 @@ * and it's name. * * Example: - * ll_entry_declare(struct my_sub_cmd, my_sub_cmd, cmd_sub, cmd.sub) = { + * ll_entry_declare(struct my_sub_cmd, my_sub_cmd, cmd_sub) = { * .x = 3, * .y = 4, * };
Hi Mateusz,
Last argument shouldn't be there.
Signed-off-by: Mateusz Zalega m.zalega@samsung.com Acked-by: Marek Vasut marex@denx.de Cc: Tom Rini trini@ti.com
Detached from earlier "DFU, MMC, Gadget, Goni, misc." series because of lack of relevance to other patches.
v2:
- deleted change-id line from commit message, sorry!
Applied to u-boot-dfu. Thanks.
include/linker_lists.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linker_lists.h b/include/linker_lists.h index 997d149..557e627 100644 --- a/include/linker_lists.h +++ b/include/linker_lists.h @@ -228,7 +228,7 @@
- and it's name.
- Example:
- ll_entry_declare(struct my_sub_cmd, my_sub_cmd, cmd_sub, cmd.sub)
= {
- ll_entry_declare(struct my_sub_cmd, my_sub_cmd, cmd_sub) = {
.x = 3,.y = 4,- };
participants (3)
-
Lukasz Majewski -
Mateusz Zalega -
Pantelis Antoniou