On Fri, 02 Oct 2015, Charles Keepax wrote:
> From: Richard Fitzgerald <[email protected]>
>
> If the declared codec type doesn't match the detected type
> we issue a log message but carry on registering the device,
> so a dev_warn() is appropriate rather than a dev_err()
>
> Signed-off-by: Richard Fitzgerald <[email protected]>
> Acked-by: Lee Jones <[email protected]>
> Signed-off-by: Charles Keepax <[email protected]>
> ---
> drivers/mfd/arizona-core.c | 16 ++++++++--------
> 1 files changed, 8 insertions(+), 8 deletions(-)
Applied, thanks.
> diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
> index e32d0d3..c3f88e5 100644
> --- a/drivers/mfd/arizona-core.c
> +++ b/drivers/mfd/arizona-core.c
> @@ -1130,8 +1130,8 @@ int arizona_dev_init(struct arizona *arizona)
> case 0x5102:
> type_name = "WM5102";
> if (arizona->type != WM5102) {
> - dev_err(arizona->dev, "WM5102 registered as %d\n",
> - arizona->type);
> + dev_warn(arizona->dev, "WM5102 registered as %d\n",
> + arizona->type);
> arizona->type = WM5102;
> }
> apply_patch = wm5102_patch;
> @@ -1149,8 +1149,8 @@ int arizona_dev_init(struct arizona *arizona)
> break;
> default:
> type_name = "WM5110";
> - dev_err(arizona->dev, "WM5110 registered as %d\n",
> - arizona->type);
> + dev_warn(arizona->dev, "WM5110 registered as %d\n",
> + arizona->type);
> arizona->type = WM5110;
> break;
> }
> @@ -1161,8 +1161,8 @@ int arizona_dev_init(struct arizona *arizona)
> case 0x8997:
> type_name = "WM8997";
> if (arizona->type != WM8997) {
> - dev_err(arizona->dev, "WM8997 registered as %d\n",
> - arizona->type);
> + dev_warn(arizona->dev, "WM8997 registered as %d\n",
> + arizona->type);
> arizona->type = WM8997;
> }
> apply_patch = wm8997_patch;
> @@ -1181,8 +1181,8 @@ int arizona_dev_init(struct arizona *arizona)
>
> default:
> type_name = "WM8998";
> - dev_err(arizona->dev, "WM8998 registered as %d\n",
> - arizona->type);
> + dev_warn(arizona->dev, "WM8998 registered as %d\n",
> + arizona->type);
> arizona->type = WM8998;
> }
>
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
