diff options
| author | Tom Rini <trini@konsulko.com> | 2021-09-30 10:26:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-09-30 10:26:43 -0400 |
| commit | c8988efc884c680eb4f34295df6689a7e312c15d (patch) | |
| tree | 573cfefc2ab21a033ae98fa2afbd57f1f6528496 /common | |
| parent | 6eecaf5d0f6b9a500dd5798f1f2bc8296bcfe158 (diff) | |
| parent | 0cf207ec01cbacae47585fcc26591dd2296507d6 (diff) | |
Merge branch '2021-09-30-whitespace-cleanups' into next
- A large number of whitespace cleanups from Wolfgang
Diffstat (limited to 'common')
| -rw-r--r-- | common/hash.c | 2 | ||||
| -rw-r--r-- | common/hwconfig.c | 2 | ||||
| -rw-r--r-- | common/lcd_console.c | 1 | ||||
| -rw-r--r-- | common/spl/spl_mmc.c | 2 | ||||
| -rw-r--r-- | common/spl/spl_ram.c | 2 | ||||
| -rw-r--r-- | common/usb_storage.c | 2 |
6 files changed, 4 insertions, 7 deletions
diff --git a/common/hash.c b/common/hash.c index 6277fe65b3e..3884298edf2 100644 --- a/common/hash.c +++ b/common/hash.c @@ -228,7 +228,7 @@ static struct hash_algo hash_algo[] = { #endif #ifdef CONFIG_SHA1 { - .name = "sha1", + .name = "sha1", .digest_size = SHA1_SUM_LEN, .chunk_size = CHUNKSZ_SHA1, #ifdef CONFIG_SHA_HW_ACCEL diff --git a/common/hwconfig.c b/common/hwconfig.c index 26a561c365b..63b3ccaf84e 100644 --- a/common/hwconfig.c +++ b/common/hwconfig.c @@ -179,7 +179,7 @@ int hwconfig_arg_cmp_f(const char *opt, const char *arg, char *buf) * * This call is similar to hwconfig_f(), except that it takes additional * argument @subopt. In this example: - * "dr_usb:mode=peripheral" + * "dr_usb:mode=peripheral" * "dr_usb" is an option, "mode" is a sub-option, and "peripheral" is its * argument. */ diff --git a/common/lcd_console.c b/common/lcd_console.c index 9c0ff4480eb..ed36c78440c 100644 --- a/common/lcd_console.c +++ b/common/lcd_console.c @@ -258,4 +258,3 @@ U_BOOT_CMD( "print string on lcd-framebuffer", " <string>" ); - diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index 212a2b09928..d52f8a3eefe 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -194,7 +194,7 @@ static int mmc_load_image_raw_partition(struct spl_image_info *spl_image, err = part_get_info(mmc_get_blk_desc(mmc), type_part, &info); if (err) continue; - if (info.sys_ind == + if (info.sys_ind == CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION_TYPE) { partition = type_part; break; diff --git a/common/spl/spl_ram.c b/common/spl/spl_ram.c index df1d5b43d8b..df9f3a4d00f 100644 --- a/common/spl/spl_ram.c +++ b/common/spl/spl_ram.c @@ -81,5 +81,3 @@ SPL_LOAD_IMAGE_METHOD("RAM", 0, BOOT_DEVICE_RAM, spl_ram_load_image); #if CONFIG_IS_ENABLED(DFU) SPL_LOAD_IMAGE_METHOD("DFU", 0, BOOT_DEVICE_DFU, spl_ram_load_image); #endif - - diff --git a/common/usb_storage.c b/common/usb_storage.c index 946c6b2b323..c9e2d7343ce 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -94,7 +94,7 @@ struct us_data { int action; /* what to do */ int ip_wanted; /* needed */ int *irq_handle; /* for USB int requests */ - unsigned int irqpipe; /* pipe for release_irq */ + unsigned int irqpipe; /* pipe for release_irq */ unsigned char irqmaxp; /* max packed for irq Pipe */ unsigned char irqinterval; /* Intervall for IRQ Pipe */ struct scsi_cmd *srb; /* current srb */ |