mirror of
https://github.com/linux-sunxi/u-boot-sunxi.git
synced 2024-02-12 11:16:03 +08:00
treewide: replace with error() with pr_err()
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 macros with Linux. (Notice Linux's BUILD_BUG_ON_MSG is implemented 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@socionext.com> Reviewed-by: Simon Glass <sjg@chromium.org> [trini: Re-run Coccinelle] Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:

committed by
Tom Rini

parent
b44b30260f
commit
9b643e312d
@ -64,7 +64,7 @@ static int adc_supply_enable(struct udevice *dev)
|
||||
}
|
||||
|
||||
if (ret)
|
||||
error("%s: can't enable %s-supply!", dev->name, supply_type);
|
||||
pr_err("%s: can't enable %s-supply!", dev->name, supply_type);
|
||||
|
||||
return ret;
|
||||
}
|
||||
@ -389,12 +389,12 @@ static int adc_pre_probe(struct udevice *dev)
|
||||
/* Set ADC VDD platdata: polarity, uV, regulator (phandle). */
|
||||
ret = adc_vdd_platdata_set(dev);
|
||||
if (ret)
|
||||
error("%s: Can't update Vdd. Error: %d", dev->name, ret);
|
||||
pr_err("%s: Can't update Vdd. Error: %d", dev->name, ret);
|
||||
|
||||
/* Set ADC VSS platdata: polarity, uV, regulator (phandle). */
|
||||
ret = adc_vss_platdata_set(dev);
|
||||
if (ret)
|
||||
error("%s: Can't update Vss. Error: %d", dev->name, ret);
|
||||
pr_err("%s: Can't update Vss. Error: %d", dev->name, ret);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user