提交 161ad30b 编写于 作者: R Richard Fitzgerald 提交者: Lee Jones

mfd: arizona: Downgrade type mismatch messages to dev_warn

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: NRichard Fitzgerald <rf@opensource.wolfsonmicro.com>
Acked-by: NLee Jones <lee.jones@linaro.org>
Signed-off-by: NCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: NLee Jones <lee.jones@linaro.org>
上级 e3424273
...@@ -1130,8 +1130,8 @@ int arizona_dev_init(struct arizona *arizona) ...@@ -1130,8 +1130,8 @@ int arizona_dev_init(struct arizona *arizona)
case 0x5102: case 0x5102:
type_name = "WM5102"; type_name = "WM5102";
if (arizona->type != WM5102) { if (arizona->type != WM5102) {
dev_err(arizona->dev, "WM5102 registered as %d\n", dev_warn(arizona->dev, "WM5102 registered as %d\n",
arizona->type); arizona->type);
arizona->type = WM5102; arizona->type = WM5102;
} }
apply_patch = wm5102_patch; apply_patch = wm5102_patch;
...@@ -1149,8 +1149,8 @@ int arizona_dev_init(struct arizona *arizona) ...@@ -1149,8 +1149,8 @@ int arizona_dev_init(struct arizona *arizona)
break; break;
default: default:
type_name = "WM5110"; type_name = "WM5110";
dev_err(arizona->dev, "WM5110 registered as %d\n", dev_warn(arizona->dev, "WM5110 registered as %d\n",
arizona->type); arizona->type);
arizona->type = WM5110; arizona->type = WM5110;
break; break;
} }
...@@ -1161,8 +1161,8 @@ int arizona_dev_init(struct arizona *arizona) ...@@ -1161,8 +1161,8 @@ int arizona_dev_init(struct arizona *arizona)
case 0x8997: case 0x8997:
type_name = "WM8997"; type_name = "WM8997";
if (arizona->type != WM8997) { if (arizona->type != WM8997) {
dev_err(arizona->dev, "WM8997 registered as %d\n", dev_warn(arizona->dev, "WM8997 registered as %d\n",
arizona->type); arizona->type);
arizona->type = WM8997; arizona->type = WM8997;
} }
apply_patch = wm8997_patch; apply_patch = wm8997_patch;
...@@ -1181,8 +1181,8 @@ int arizona_dev_init(struct arizona *arizona) ...@@ -1181,8 +1181,8 @@ int arizona_dev_init(struct arizona *arizona)
default: default:
type_name = "WM8998"; type_name = "WM8998";
dev_err(arizona->dev, "WM8998 registered as %d\n", dev_warn(arizona->dev, "WM8998 registered as %d\n",
arizona->type); arizona->type);
arizona->type = WM8998; arizona->type = WM8998;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册