[U-Boot] [PATCH 2/6] treewide: replace with error() with pr_err()

Simon Glass sjg at chromium.org
Sun Sep 17 17:52:52 UTC 2017


On 13 September 2017 at 05:45, Masahiro Yamada
<yamada.masahiro at socionext.com> wrote:
> U-Boot widely uses error() as a bit noisier variant of printf().
>
> This macro causes name conflict with the following line in
> include/linux/compiler-gcc.h:
>
>   # define __compiletime_error(message) __attribute__((error(message)))
>
> This prevents us from using __compiletime_error(), and makes it
> difficult to fully sync BUILD_BUG stuff with Linux.  (Notice
> Linux's BUILD_BUG_ON_MSG is defined by using compiletime_assert().)
>
> Let's convert error() into now treewide-available pr_err().
>
> Done with the help of Coccinelle, excluing tools/ directory.
>
> The semantic patch I used is as follows:
>
> // <smpl>
> @@@@
> -error
> +pr_err
>  (...)
> // </smpl>
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro at socionext.com>
> ---
>
>  arch/arm/mach-omap2/am33xx/board.c            |  2 +-
>  arch/arm/mach-omap2/utils.c                   |  4 +-
>  arch/arm/mach-rockchip/rk3188-board-spl.c     |  2 +-
>  arch/arm/mach-rockchip/rk3188-board.c         |  2 +-
>  arch/arm/mach-rockchip/rk3368-board-spl.c     |  4 +-
>  arch/arm/mach-rockchip/rk3399/sdram_rk3399.c  |  2 +-
>  arch/arm/mach-socfpga/reset_manager_arria10.c |  2 +-
>  arch/arm/mach-tegra/ivc.c                     |  8 +--
>  arch/arm/mach-tegra/tegra124/xusb-padctl.c    |  2 +-
>  arch/arm/mach-tegra/tegra186/nvtboot_mem.c    |  4 +-
>  arch/arm/mach-tegra/tegra20/clock.c           |  6 +-
>  arch/arm/mach-tegra/tegra210/xusb-padctl.c    |  2 +-
>  arch/arm/mach-tegra/tegra30/clock.c           |  6 +-
>  arch/arm/mach-tegra/xusb-padctl-common.c      | 22 +++----
>  arch/x86/cpu/tangier/sdram.c                  |  6 +-
>  board/nvidia/jetson-tk1/jetson-tk1.c          |  6 +-
>  board/samsung/common/exynos5-dt.c             |  2 +-
>  board/samsung/common/misc.c                   |  2 +-
>  board/samsung/goni/goni.c                     |  4 +-
>  board/samsung/odroid/odroid.c                 | 12 ++--
>  cmd/fastboot.c                                |  2 +-
>  cmd/nvedit.c                                  |  6 +-
>  cmd/regulator.c                               |  2 +-
>  cmd/thordown.c                                |  6 +-
>  cmd/tpm_test.c                                |  6 +-
>  cmd/usb_gadget_sdp.c                          |  4 +-
>  cmd/usb_mass_storage.c                        |  6 +-
>  common/dfu.c                                  |  6 +-
>  common/fb_mmc.c                               | 36 +++++------
>  common/fb_nand.c                              | 12 ++--
>  common/spl/spl_dfu.c                          |  4 +-
>  common/spl/spl_sdp.c                          |  4 +-
>  common/update.c                               |  2 +-
>  disk/part_efi.c                               | 10 +--
>  drivers/adc/adc-uclass.c                      |  6 +-
>  drivers/adc/exynos-adc.c                      |  6 +-
>  drivers/adc/sandbox.c                         |  6 +-
>  drivers/ata/dwc_ahci.c                        |  6 +-
>  drivers/clk/clk_boston.c                      |  4 +-
>  drivers/clk/clk_stm32f7.c                     |  2 +-
>  drivers/clk/rockchip/clk_rk3368.c             |  8 +--
>  drivers/clk/rockchip/clk_rk3399.c             |  6 +-
>  drivers/clk/rockchip/clk_rv1108.c             |  2 +-
>  drivers/dfu/dfu.c                             | 14 ++--
>  drivers/dfu/dfu_mmc.c                         | 18 +++---
>  drivers/dfu/dfu_ram.c                         |  8 +--
>  drivers/dfu/dfu_tftp.c                        |  4 +-
>  drivers/dma/dma-uclass.c                      |  2 +-
>  drivers/dma/lpc32xx_dma.c                     |  8 +--
>  drivers/dma/ti-edma3.c                        |  2 +-
>  drivers/i2c/i2c-gpio.c                        |  2 +-
>  drivers/i2c/omap24xx_i2c.c                    |  2 +-
>  drivers/i2c/stm32f7_i2c.c                     | 16 ++---
>  drivers/i2c/tegra_i2c.c                       |  4 +-
>  drivers/misc/tegra186_bpmp.c                  | 28 ++++----
>  drivers/mmc/exynos_dw_mmc.c                   |  2 +-
>  drivers/mmc/hi6220_dw_mmc.c                   |  2 +-
>  drivers/mmc/xenon_sdhci.c                     |  4 +-
>  drivers/mtd/nand/lpc32xx_nand_mlc.c           |  6 +-
>  drivers/mtd/nand/pxa3xx_nand.c                |  2 +-
>  drivers/net/bcm-sf2-eth-gmac.c                | 14 ++--
>  drivers/net/bcm-sf2-eth.c                     | 18 +++---
>  drivers/net/cpsw-common.c                     |  8 +--
>  drivers/net/cpsw.c                            |  8 +--
>  drivers/net/dwc_eth_qos.c                     | 92 +++++++++++++--------------
>  drivers/net/ep93xx_eth.c                      | 16 ++---
>  drivers/net/keystone_net.c                    | 14 ++--
>  drivers/pci/pci_tegra.c                       | 50 +++++++--------
>  drivers/pci/pcie_xilinx.c                     |  2 +-
>  drivers/phy/marvell/comphy_cp110.c            | 40 ++++++------
>  drivers/phy/ti-pipe3-phy.c                    | 12 ++--
>  drivers/pinctrl/mvebu/pinctrl-armada-37xx.c   |  2 +-
>  drivers/pinctrl/pinctrl-sti.c                 | 14 ++--
>  drivers/pinctrl/pinctrl_stm32.c               |  2 +-
>  drivers/power/pmic/as3722.c                   | 12 ++--
>  drivers/power/pmic/as3722_gpio.c              | 10 +--
>  drivers/power/pmic/i2c_pmic_emul.c            |  6 +-
>  drivers/power/pmic/lp873x.c                   |  4 +-
>  drivers/power/pmic/lp87565.c                  |  4 +-
>  drivers/power/pmic/max77686.c                 |  4 +-
>  drivers/power/pmic/max8997.c                  |  4 +-
>  drivers/power/pmic/max8998.c                  |  4 +-
>  drivers/power/pmic/palmas.c                   |  4 +-
>  drivers/power/pmic/pfuze100.c                 |  4 +-
>  drivers/power/pmic/s2mps11.c                  |  4 +-
>  drivers/power/pmic/s5m8767.c                  |  4 +-
>  drivers/power/pmic/sandbox.c                  |  6 +-
>  drivers/power/pmic/tps65090.c                 |  4 +-
>  drivers/power/regulator/fixed.c               |  2 +-
>  drivers/power/regulator/gpio-regulator.c      |  2 +-
>  drivers/power/regulator/max77686.c            | 20 +++---
>  drivers/power/regulator/sandbox.c             | 18 +++---
>  drivers/ram/rockchip/dmc-rk3368.c             | 14 ++--
>  drivers/ram/stm32_sdram.c                     |  8 +--
>  drivers/reset/sti-reset.c                     | 10 +--
>  drivers/spi/atmel_spi.c                       |  2 +-
>  drivers/spi/lpc32xx_ssp.c                     |  6 +-
>  drivers/sysreset/sysreset_sti.c               |  6 +-
>  drivers/sysreset/sysreset_syscon.c            |  4 +-
>  drivers/sysreset/sysreset_watchdog.c          |  2 +-
>  drivers/tpm/tpm_tis_infineon.c                |  2 +-
>  drivers/usb/common/common.c                   |  2 +-
>  drivers/usb/eth/mcs7830.c                     | 12 ++--
>  drivers/usb/gadget/at91_udc.c                 |  4 +-
>  drivers/usb/gadget/atmel_usba_udc.c           |  6 +-
>  drivers/usb/gadget/dwc2_udc_otg.c             |  2 +-
>  drivers/usb/gadget/ether.c                    | 42 ++++++------
>  drivers/usb/gadget/f_fastboot.c               | 10 +--
>  drivers/usb/gadget/f_sdp.c                    | 16 ++---
>  drivers/usb/gadget/f_thor.c                   | 26 ++++----
>  drivers/usb/host/dwc2.c                       |  2 +-
>  drivers/usb/host/ehci-generic.c               | 18 +++---
>  drivers/usb/host/ohci-generic.c               | 18 +++---
>  drivers/usb/host/xhci-dwc3.c                  |  6 +-
>  drivers/usb/host/xhci-rockchip.c              | 12 ++--
>  drivers/usb/musb-new/ti-musb.c                | 12 ++--
>  drivers/video/am335x-fb.c                     |  2 +-
>  env/common.c                                  |  8 +--
>  env/sf.c                                      |  2 +-
>  fs/jffs2/jffs2_nand_1pass.c                   |  2 +-
>  fs/yaffs2/yaffs_uboot_glue.c                  |  2 +-
>  121 files changed, 521 insertions(+), 521 deletions(-)

Reviewed-by: Simon Glass <sjg at chromium.org>


More information about the U-Boot mailing list