From: Wolfgang Denk Date: Mon, 27 Sep 2021 15:42:38 +0000 (+0200) Subject: WS cleanup: remove trailing white space X-Git-Url: http://git.dujemihanovic.xyz/login.html?a=commitdiff_plain;h=0a50b3c97b3408e52589d873d4c7b54ad365a76c;p=u-boot.git WS cleanup: remove trailing white space Signed-off-by: Wolfgang Denk Reviewed-by: Simon Glass --- diff --git a/Licenses/lgpl-2.0.txt b/Licenses/lgpl-2.0.txt index 5bc8fb2c8f..12735e6c21 100644 --- a/Licenses/lgpl-2.0.txt +++ b/Licenses/lgpl-2.0.txt @@ -133,7 +133,7 @@ such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. - + 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an diff --git a/Makefile b/Makefile index cf9466cec9..4392df6280 100644 --- a/Makefile +++ b/Makefile @@ -327,14 +327,14 @@ os_x_before = $(shell if [ $(DARWIN_MAJOR_VERSION) -le $(1) -a \ $(DARWIN_MINOR_VERSION) -le $(2) ] ; then echo "$(3)"; else echo "$(4)"; fi ;) os_x_after = $(shell if [ $(DARWIN_MAJOR_VERSION) -ge $(1) -a \ - $(DARWIN_MINOR_VERSION) -ge $(2) ] ; then echo "$(3)"; else echo "$(4)"; fi ;) + $(DARWIN_MINOR_VERSION) -ge $(2) ] ; then echo "$(3)"; else echo "$(4)"; fi ;) # Snow Leopards build environment has no longer restrictions as described above HOSTCC = $(call os_x_before, 10, 5, "cc", "gcc") KBUILD_HOSTCFLAGS += $(call os_x_before, 10, 4, "-traditional-cpp") KBUILD_HOSTLDFLAGS += $(call os_x_before, 10, 5, "-multiply_defined suppress") -# macOS Mojave (10.14.X) +# macOS Mojave (10.14.X) # Undefined symbols for architecture x86_64: "_PyArg_ParseTuple" KBUILD_HOSTLDFLAGS += $(call os_x_after, 10, 14, "-lpython -dynamclib", "") endif diff --git a/arch/arm/include/asm/arch-am33xx/cpu.h b/arch/arm/include/asm/arch-am33xx/cpu.h index 79081de700..b33e6f7fd1 100644 --- a/arch/arm/include/asm/arch-am33xx/cpu.h +++ b/arch/arm/include/asm/arch-am33xx/cpu.h @@ -408,7 +408,7 @@ struct cm_dpll { unsigned int resv1; unsigned int clktimer2clk; /* offset 0x04 */ unsigned int resv2[11]; - unsigned int clkselmacclk; /* offset 0x34 */ + unsigned int clkselmacclk; /* offset 0x34 */ }; #endif /* CONFIG_AM43XX */ diff --git a/arch/arm/lib/lib1funcs.S b/arch/arm/lib/lib1funcs.S index 0798d098af..700eee5fbb 100644 --- a/arch/arm/lib/lib1funcs.S +++ b/arch/arm/lib/lib1funcs.S @@ -34,7 +34,7 @@ mov \divisor, \divisor, lsl \result mov \curbit, \curbit, lsl \result mov \result, #0 - + #else @ Initially shift the divisor left 3 bits if possible, @@ -48,7 +48,7 @@ @ Unless the divisor is very big, shift it up in multiples of @ four bits, since this is the amount of unwinding in the main - @ division loop. Continue shifting until the divisor is + @ division loop. Continue shifting until the divisor is @ larger than the dividend. 1: cmp \divisor, #0x10000000 cmplo \divisor, \dividend @@ -135,7 +135,7 @@ @ Unless the divisor is very big, shift it up in multiples of @ four bits, since this is the amount of unwinding in the main - @ division loop. Continue shifting until the divisor is + @ division loop. Continue shifting until the divisor is @ larger than the dividend. 1: cmp \divisor, #0x10000000 cmplo \divisor, \dividend diff --git a/arch/xtensa/include/asm/arch-de212/core.h b/arch/xtensa/include/asm/arch-de212/core.h index 443fd459ca..3271406291 100644 --- a/arch/xtensa/include/asm/arch-de212/core.h +++ b/arch/xtensa/include/asm/arch-de212/core.h @@ -89,7 +89,7 @@ #define XCHAL_HAVE_HIFI3_VFPU 0 /* HiFi3 Audio Engine VFPU option */ #define XCHAL_HAVE_HIFI2 0 /* HiFi2 Audio Engine pkg */ #define XCHAL_HAVE_HIFI2EP 0 /* HiFi2EP */ -#define XCHAL_HAVE_HIFI_MINI 0 +#define XCHAL_HAVE_HIFI_MINI 0 #define XCHAL_HAVE_VECTORFPU2005 0 /* vector or user floating-point pkg */ diff --git a/board/freescale/common/sys_eeprom.c b/board/freescale/common/sys_eeprom.c index 35df8ba389..431f8caeb0 100644 --- a/board/freescale/common/sys_eeprom.c +++ b/board/freescale/common/sys_eeprom.c @@ -62,7 +62,7 @@ static struct __attribute__ ((__packed__)) eeprom { u8 mac_count; /* 0x40 Number of MAC addresses */ u8 mac_flag; /* 0x41 MAC table flags */ u8 mac[MAX_NUM_PORTS][6]; /* 0x42 - 0xa1 MAC addresses */ - u8 res_2[90]; /* 0xa2 - 0xfb Reserved */ + u8 res_2[90]; /* 0xa2 - 0xfb Reserved */ u32 crc; /* 0xfc - 0xff CRC32 checksum */ #endif } e; diff --git a/board/qualcomm/dragonboard820c/dragonboard820c.c b/board/qualcomm/dragonboard820c/dragonboard820c.c index 4ccb1a0750..f9cc762a25 100644 --- a/board/qualcomm/dragonboard820c/dragonboard820c.c +++ b/board/qualcomm/dragonboard820c/dragonboard820c.c @@ -73,7 +73,7 @@ static void sdhci_power_init(void) /* drive strength configs for sdhc pins */ const struct tlmm_cfg hdrv[] = { - + { SDC1_CLK_HDRV, TLMM_CUR_VAL_16MA, TLMM_HDRV_MASK, }, { SDC1_CMD_HDRV, TLMM_CUR_VAL_10MA, TLMM_HDRV_MASK, }, { SDC1_DATA_HDRV, TLMM_CUR_VAL_10MA, TLMM_HDRV_MASK, }, @@ -81,14 +81,14 @@ static void sdhci_power_init(void) /* pull configs for sdhc pins */ const struct tlmm_cfg pull[] = { - + { SDC1_CLK_PULL, TLMM_NO_PULL, TLMM_PULL_MASK, }, { SDC1_CMD_PULL, TLMM_PULL_UP, TLMM_PULL_MASK, }, { SDC1_DATA_PULL, TLMM_PULL_UP, TLMM_PULL_MASK, }, }; const struct tlmm_cfg rclk[] = { - + { SDC1_RCLK_PULL, TLMM_PULL_DOWN, TLMM_PULL_MASK,}, }; diff --git a/board/warp7/README b/board/warp7/README index 579bb2de38..05cdfd0027 100644 --- a/board/warp7/README +++ b/board/warp7/README @@ -19,7 +19,7 @@ $ make This will generate the U-Boot binary called u-boot-dtb.imx. -Put warp7 board in USB download mode: +Put warp7 board in USB download mode: Remove the CPU board from the base board then put switch 2 in the upper position diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index 212a2b0992..d52f8a3eef 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/doc/README.distro b/doc/README.distro index c4f041ca71..fa8cec1102 100644 --- a/doc/README.distro +++ b/doc/README.distro @@ -233,7 +233,7 @@ fdtfile: the DTB with a different DTB. fdtfile will automatically be set for you if it matches the format ${soc}-${board}.dtb which covers most 32 bit use cases. AArch64 generally does not match as the Linux kernel put the dtb files under - SoC vendor directories. + SoC vendor directories. ramdisk_addr_r: diff --git a/doc/imx/common/imx6.txt b/doc/imx/common/imx6.txt index 0b5061128c..9007cfbf58 100644 --- a/doc/imx/common/imx6.txt +++ b/doc/imx/common/imx6.txt @@ -9,7 +9,7 @@ SoC. 1.1 MAC Address: It is stored in fuse bank 4, with the 32 lsbs in word 2 and the 16 msbs in word 3[15:0]. For i.MX6SX and i.MX6UL, they have two MAC addresses. The second MAC address - is stored in fuse bank 4, with the 16 lsb in word 3[31:16] and the 32 msbs in + is stored in fuse bank 4, with the 16 lsb in word 3[31:16] and the 32 msbs in word 4. Example: diff --git a/drivers/misc/atsha204a-i2c.c b/drivers/misc/atsha204a-i2c.c index af65c559dc..52d9eadf49 100644 --- a/drivers/misc/atsha204a-i2c.c +++ b/drivers/misc/atsha204a-i2c.c @@ -339,7 +339,7 @@ int atsha204a_read(struct udevice *dev, enum atsha204a_zone zone, bool read32, retry--; atsha204a_wakeup(dev); } while (retry >= 0); - + if (res) { debug("ATSHA204A read failed\n"); return res; diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 582129d0df..d0351b2c6a 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -4,7 +4,7 @@ * drivers and users. * * Copyright © 1999-2010 David Woodhouse - * Copyright © 2006 Red Hat UK Limited + * Copyright © 2006 Red Hat UK Limited * */ @@ -123,7 +123,7 @@ void *idr_get_next(struct idr *idp, int *next) } else { *next = 0; } - + return ret; } diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index b1fd779884..0c26e1d9e6 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -907,7 +907,7 @@ static int nand_wait(struct mtd_info *mtd, struct nand_chip *chip) u32 timer = (CONFIG_SYS_HZ * timeo) / 1000; u32 time_start; - + time_start = get_timer(0); while (get_timer(time_start) < timer) { if (chip->dev_ready) { diff --git a/drivers/mtd/nand/raw/nand_util.c b/drivers/mtd/nand/raw/nand_util.c index 5cc256bf20..d03b8645c4 100644 --- a/drivers/mtd/nand/raw/nand_util.c +++ b/drivers/mtd/nand/raw/nand_util.c @@ -189,7 +189,7 @@ int nand_erase_opts(struct mtd_info *mtd, #define NAND_CMD_LOCK_TIGHT 0x2c #define NAND_CMD_LOCK_STATUS 0x7a - + /****************************************************************************** * Support for locking / unlocking operations of some NAND devices *****************************************************************************/ diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c index 61e38ba1ab..e2bd32697e 100644 --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c @@ -115,7 +115,7 @@ static struct ubi_device *ubi_devices[UBI_MAX_DEVICES]; #else struct ubi_device *ubi_devices[UBI_MAX_DEVICES]; #endif - + #ifndef __UBOOT__ /* Serializes UBI devices creations and removals */ DEFINE_MUTEX(ubi_devices_mutex); diff --git a/drivers/net/phy/meson-gxl.c b/drivers/net/phy/meson-gxl.c index ffb1a61402..753ca72768 100644 --- a/drivers/net/phy/meson-gxl.c +++ b/drivers/net/phy/meson-gxl.c @@ -73,7 +73,7 @@ restart_aneg: if (!(wol & BIT(12)) || ((exp & EXPANSION_NWAY) && !(lpa & LPA_LPACK))) { - + /* Looks like aneg failed after all */ if (!retries) { printf("%s LPA corruption max attempts\n", diff --git a/drivers/ram/stm32_sdram.c b/drivers/ram/stm32_sdram.c index 3e25cc7a01..47a930ee95 100644 --- a/drivers/ram/stm32_sdram.c +++ b/drivers/ram/stm32_sdram.c @@ -286,7 +286,7 @@ static int stm32_fmc_of_to_plat(struct udevice *dev) } else { dev_dbg(dev, "cannot find st,mem_remap property\n"); } - + swp_fmc = dev_read_u32_default(dev, "st,swp_fmc", NOT_FOUND); if (swp_fmc != NOT_FOUND) { /* set fmc swapping selection */ diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c index d4e0745d0e..5896bcb421 100644 --- a/drivers/reset/reset-meson.c +++ b/drivers/reset/reset-meson.c @@ -70,16 +70,16 @@ struct reset_ops meson_reset_ops = { .rst_deassert = meson_reset_deassert, }; -static const struct udevice_id meson_reset_ids[] = { - { .compatible = "amlogic,meson-gxbb-reset" }, +static const struct udevice_id meson_reset_ids[] = { + { .compatible = "amlogic,meson-gxbb-reset" }, { .compatible = "amlogic,meson-axg-reset" }, - { } -}; + { } +}; static int meson_reset_probe(struct udevice *dev) { struct meson_reset_priv *priv = dev_get_priv(dev); - + return regmap_init_mem(dev_ofnode(dev), &priv->regmap); } diff --git a/drivers/serial/serial_msm.c b/drivers/serial/serial_msm.c index ac4d0824b9..a22623c316 100644 --- a/drivers/serial/serial_msm.c +++ b/drivers/serial/serial_msm.c @@ -233,7 +233,7 @@ static int msm_serial_of_to_plat(struct udevice *dev) if (priv->base == FDT_ADDR_T_NONE) return -EINVAL; - priv->clk_bit_rate = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), + priv->clk_bit_rate = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), "bit-rate", UART_DM_CLK_RX_TX_BIT_RATE); return 0; diff --git a/drivers/usb/dwc3/dwc3-meson-gxl.c b/drivers/usb/dwc3/dwc3-meson-gxl.c index 08467d6210..7c26290c15 100644 --- a/drivers/usb/dwc3/dwc3-meson-gxl.c +++ b/drivers/usb/dwc3/dwc3-meson-gxl.c @@ -170,7 +170,7 @@ static int dwc3_meson_gxl_usb2_init(struct dwc3_meson_gxl *priv) static int dwc3_meson_gxl_usb_init(struct dwc3_meson_gxl *priv) { int ret; - + ret = dwc3_meson_gxl_usb2_init(priv); if (ret) return ret; diff --git a/drivers/usb/musb-new/musb_regs.h b/drivers/usb/musb-new/musb_regs.h index e9362f6def..9fd01fafdf 100644 --- a/drivers/usb/musb-new/musb_regs.h +++ b/drivers/usb/musb-new/musb_regs.h @@ -190,7 +190,7 @@ /* SUNXI has different reg addresses, but identical r/w functions */ -#ifndef CONFIG_ARCH_SUNXI +#ifndef CONFIG_ARCH_SUNXI /* * Common USB registers diff --git a/drivers/usb/musb-new/musb_uboot.c b/drivers/usb/musb-new/musb_uboot.c index 8ac2f0a78a..61ff68def2 100644 --- a/drivers/usb/musb-new/musb_uboot.c +++ b/drivers/usb/musb-new/musb_uboot.c @@ -159,7 +159,7 @@ static struct int_queue *_musb_create_int_queue(struct musb_host_data *host, static int _musb_destroy_int_queue(struct musb_host_data *host, struct usb_device *dev, struct int_queue *queue) { - int index = usb_pipein(queue->urb.pipe) * 16 + + int index = usb_pipein(queue->urb.pipe) * 16 + usb_pipeendpoint(queue->urb.pipe); if (queue->urb.status == -EINPROGRESS) diff --git a/drivers/usb/musb/musb_hcd.c b/drivers/usb/musb/musb_hcd.c index afbc648883..ffed3b82be 100644 --- a/drivers/usb/musb/musb_hcd.c +++ b/drivers/usb/musb/musb_hcd.c @@ -327,7 +327,7 @@ static int ctrlreq_out_data_phase(struct usb_device *dev, u32 len, void *buffer) /* Set TXPKTRDY bit */ csr = readw(&musbr->txcsr); - + csr |= MUSB_CSR0_TXPKTRDY; csr |= MUSB_CSR0_H_DIS_PING; writew(csr, &musbr->txcsr); diff --git a/drivers/video/anx9804.c b/drivers/video/anx9804.c index b050c4292f..3037ff39b4 100644 --- a/drivers/video/anx9804.c +++ b/drivers/video/anx9804.c @@ -67,11 +67,11 @@ void anx9804_init(unsigned int i2c_bus, u8 lanes, u8 data_rate, int bpp) printf("Error anx9804 clock is not stable\n"); i2c_reg_write(0x39, ANX9804_VID_CTRL2_REG, colordepth); - + /* Set a bunch of analog related register values */ - i2c_reg_write(0x38, ANX9804_PLL_CTRL_REG, 0x07); - i2c_reg_write(0x39, ANX9804_PLL_FILTER_CTRL3, 0x19); - i2c_reg_write(0x39, ANX9804_PLL_CTRL3, 0xd9); + i2c_reg_write(0x38, ANX9804_PLL_CTRL_REG, 0x07); + i2c_reg_write(0x39, ANX9804_PLL_FILTER_CTRL3, 0x19); + i2c_reg_write(0x39, ANX9804_PLL_CTRL3, 0xd9); i2c_reg_write(0x39, ANX9804_RST_CTRL2_REG, ANX9804_RST_CTRL2_AC_MODE); i2c_reg_write(0x39, ANX9804_ANALOG_DEBUG_REG1, 0xf0); i2c_reg_write(0x39, ANX9804_ANALOG_DEBUG_REG3, 0x99); @@ -105,7 +105,7 @@ void anx9804_init(unsigned int i2c_bus, u8 lanes, u8 data_rate, int bpp) i2c_reg_write(0x38, ANX9804_LINK_BW_SET_REG, data_rate); i2c_reg_write(0x38, ANX9804_LANE_COUNT_SET_REG, lanes); - /* Link training */ + /* Link training */ i2c_reg_write(0x38, ANX9804_LINK_TRAINING_CTRL_REG, ANX9804_LINK_TRAINING_CTRL_EN); mdelay(5); diff --git a/drivers/video/tdo-tl070wsh30.c b/drivers/video/tdo-tl070wsh30.c index 813b87a681..7ad0af73f0 100644 --- a/drivers/video/tdo-tl070wsh30.c +++ b/drivers/video/tdo-tl070wsh30.c @@ -118,7 +118,7 @@ static int tl070wsh30_panel_probe(struct udevice *dev) /* reset panel */ dm_gpio_set_value(&priv->reset, true); - + mdelay(10); dm_gpio_set_value(&priv->reset, false); diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h index cf46b54718..4b45e33ad1 100644 --- a/include/configs/imx6-engicam.h +++ b/include/configs/imx6-engicam.h @@ -105,7 +105,7 @@ #ifdef CONFIG_MX6UL # define DRAM_OFFSET(x) 0x87##x # define FDT_ADDR __stringify(DRAM_OFFSET(800000)) -#else +#else # define DRAM_OFFSET(x) 0x1##x # define FDT_ADDR __stringify(DRAM_OFFSET(8000000)) #endif diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h index 2fba9dc317..3417ca2a0d 100644 --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h @@ -945,7 +945,7 @@ struct nand_chip { int jedec_version; struct nand_onfi_params onfi_params; struct nand_jedec_params jedec_params; - + struct nand_data_interface *data_interface; int read_retries; diff --git a/include/linux/serial_reg.h b/include/linux/serial_reg.h index dca7efa142..20ea54397f 100644 --- a/include/linux/serial_reg.h +++ b/include/linux/serial_reg.h @@ -3,7 +3,7 @@ * include/linux/serial_reg.h * * Copyright (C) 1992, 1994 by Theodore Ts'o. - * + * * These are the UART port assignments, expressed as offsets from the base * register. These assignments should hold for any serial port based on * a 8250, 16450, or 16550(A). @@ -88,7 +88,7 @@ #define UART_LCR 3 /* Out: Line Control Register */ /* - * Note: if the word length is 5 bits (UART_LCR_WLEN5), then setting + * Note: if the word length is 5 bits (UART_LCR_WLEN5), then setting * UART_LCR_STOP will select 1.5 stop bits, not 2 stop bits. */ #define UART_LCR_DLAB 0x80 /* Divisor latch access bit */ diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index a9e48cc7b5..2ec7419301 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -639,7 +639,7 @@ on_set_option_mode3_activate(GtkMenuItem *menuitem, gpointer user_data) void on_introduction1_activate(GtkMenuItem * menuitem, gpointer user_data) { GtkWidget *dialog; - const gchar *intro_text = + const gchar *intro_text = "Welcome to gkc, the GTK+ graphical configuration tool\n" "For each option, a blank box indicates the feature is disabled, a\n" "check indicates it is enabled, and a dot indicates that it is to\n" diff --git a/tools/asn1_compiler.c b/tools/asn1_compiler.c index adabd41452..03fb7e0375 100644 --- a/tools/asn1_compiler.c +++ b/tools/asn1_compiler.c @@ -427,7 +427,7 @@ static void tokenise(char *buffer, char *end) } memcpy(tokens[tix].content, start, tokens[tix].size); tokens[tix].content[tokens[tix].size] = 0; - + /* If it begins with a lowercase letter then * it's an element name */ diff --git a/tools/patman/test/test01.txt b/tools/patman/test/test01.txt index b238a8b4ba..de2d9e4d28 100644 --- a/tools/patman/test/test01.txt +++ b/tools/patman/test/test01.txt @@ -3,15 +3,15 @@ Author: Simon Glass Date: Sat Apr 15 15:39:08 2017 -0600 pci: Correct cast for sandbox - + This gives a warning with some native compilers: - + cmd/pci.c:152:11: warning: format ‘%llx’ expects argument of type ‘long long unsigned int’, but argument 3 has type ‘u64 {aka long unsigned int}’ [-Wformat=] - + Fix it with a cast. - + Signed-off-by: Simon Glass Commit-changes: 2 - second revision change @@ -21,7 +21,7 @@ Date: Sat Apr 15 15:39:08 2017 -0600 about some things from the first commit END - + Commit-notes: Some notes about the first commit @@ -32,15 +32,15 @@ Author: Simon Glass Date: Sat Apr 15 15:39:08 2017 -0600 fdt: Correct cast for sandbox in fdtdec_setup_mem_size_base() - + This gives a warning with some native compilers: - + lib/fdtdec.c:1203:8: warning: format ‘%llx’ expects argument of type ‘long long unsigned int’, but argument 3 has type ‘long unsigned int’ [-Wformat=] - + Fix it with a cast. - + Signed-off-by: Simon Glass Series-to: u-boot Series-prefix: RFC @@ -60,7 +60,7 @@ Date: Sat Apr 15 15:39:08 2017 -0600 Cover-changes: 4 - Some notes for the cover letter - + Cover-letter: test: A test patch series This is a test of how the cover