| Message ID | 16d0c2060725654bb87a45e766b9752ef1d3b988.1516094113.git-series.maxime.ripard@free-electrons.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | env: Multiple env support and env transition for sunxi | expand |
Hi Maxime, On 16 January 2018 at 01:16, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > Since we have global messages to indicate what's going on, the custom > messages in the environment drivers only make the output less readable. > > Make FAT play a little nicer by removing all the extra \n and formatting > that is redundant with the global output. > > Reviewed-by: Andre Przywara <andre.przywara@arm.com> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > --- > env/fat.c | 25 ++++++++++++++++++++----- > 1 file changed, 20 insertions(+), 5 deletions(-) Do you have a change log for this patch? Regards, Simon
On Wed, Jan 17, 2018 at 03:03:47PM -0700, Simon Glass wrote: > Hi Maxime, > > On 16 January 2018 at 01:16, Maxime Ripard > <maxime.ripard@free-electrons.com> wrote: > > Since we have global messages to indicate what's going on, the custom > > messages in the environment drivers only make the output less readable. > > > > Make FAT play a little nicer by removing all the extra \n and formatting > > that is redundant with the global output. > > > > Reviewed-by: Andre Przywara <andre.przywara@arm.com> > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > > --- > > env/fat.c | 25 ++++++++++++++++++++----- > > 1 file changed, 20 insertions(+), 5 deletions(-) > > Do you have a change log for this patch? Sorry, it was buried in my cover letter. You have the diff here: http://code.bulix.org/g3emu3-259575 tl; dr: I added some comments around the printf's to make it obvious that the missing \n were intentional. Maxime -- Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
diff --git a/env/fat.c b/env/fat.c index ec49c3905369..158a9a34357b 100644 --- a/env/fat.c +++ b/env/fat.c @@ -55,7 +55,11 @@ static int env_fat_save(void) dev = dev_desc->devnum; if (fat_set_blk_dev(dev_desc, &info) != 0) { - printf("\n** Unable to use %s %d:%d for saveenv **\n", + /* + * This printf is embedded in the messages from env_save that + * will calling it. The missing \n is intentional. + */ + printf("Unable to use %s %d:%d... ", CONFIG_ENV_FAT_INTERFACE, dev, part); return 1; } @@ -63,12 +67,15 @@ static int env_fat_save(void) err = file_fat_write(CONFIG_ENV_FAT_FILE, (void *)&env_new, 0, sizeof(env_t), &size); if (err == -1) { - printf("\n** Unable to write \"%s\" from %s%d:%d **\n", + /* + * This printf is embedded in the messages from env_save that + * will calling it. The missing \n is intentional. + */ + printf("Unable to write \"%s\" from %s%d:%d... ", CONFIG_ENV_FAT_FILE, CONFIG_ENV_FAT_INTERFACE, dev, part); return 1; } - puts("done\n"); return 0; } #endif /* CMD_SAVEENV */ @@ -90,14 +97,22 @@ static int env_fat_load(void) dev = dev_desc->devnum; if (fat_set_blk_dev(dev_desc, &info) != 0) { - printf("\n** Unable to use %s %d:%d for loading the env **\n", + /* + * This printf is embedded in the messages from env_save that + * will calling it. The missing \n is intentional. + */ + printf("Unable to use %s %d:%d... ", CONFIG_ENV_FAT_INTERFACE, dev, part); goto err_env_relocate; } err = file_fat_read(CONFIG_ENV_FAT_FILE, buf, CONFIG_ENV_SIZE); if (err == -1) { - printf("\n** Unable to read \"%s\" from %s%d:%d **\n", + /* + * This printf is embedded in the messages from env_save that + * will calling it. The missing \n is intentional. + */ + printf("Unable to read \"%s\" from %s%d:%d... ", CONFIG_ENV_FAT_FILE, CONFIG_ENV_FAT_INTERFACE, dev, part); goto err_env_relocate; }