diff options
author | Masahiro Yamada | 2017-09-16 14:10:41 +0900 |
---|---|---|
committer | Tom Rini | 2017-10-04 11:59:44 -0400 |
commit | 9b643e312d528f291966c1f30b0d90bf3b1d43dc (patch) | |
tree | 35e3780c0aabb8af73ce19a60bb8973b3f2479cd /drivers/adc/rockchip-saradc.c | |
parent | b44b30260ffa3dc82f4bb98b022483bb09e95353 (diff) |
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>
Diffstat (limited to 'drivers/adc/rockchip-saradc.c')
-rw-r--r-- | drivers/adc/rockchip-saradc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/adc/rockchip-saradc.c b/drivers/adc/rockchip-saradc.c index 0e6271d097a..a2856db497d 100644 --- a/drivers/adc/rockchip-saradc.c +++ b/drivers/adc/rockchip-saradc.c @@ -46,7 +46,7 @@ int rockchip_saradc_channel_data(struct udevice *dev, int channel, struct adc_uclass_platdata *uc_pdata = dev_get_uclass_platdata(dev); if (channel != priv->active_channel) { - error("Requested channel is not active!"); + pr_err("Requested channel is not active!"); return -EINVAL; } @@ -69,7 +69,7 @@ int rockchip_saradc_start_channel(struct udevice *dev, int channel) struct rockchip_saradc_priv *priv = dev_get_priv(dev); if (channel < 0 || channel >= priv->data->num_channels) { - error("Requested channel is invalid!"); + pr_err("Requested channel is invalid!"); return -EINVAL; } @@ -125,7 +125,7 @@ int rockchip_saradc_ofdata_to_platdata(struct udevice *dev) data = (struct rockchip_saradc_data *)dev_get_driver_data(dev); priv->regs = (struct rockchip_saradc_regs *)dev_read_addr(dev); if (priv->regs == (struct rockchip_saradc_regs *)FDT_ADDR_T_NONE) { - error("Dev: %s - can't get address!", dev->name); + pr_err("Dev: %s - can't get address!", dev->name); return -ENODATA; } |