evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mfd: arizona: Downgrade type mismatch messages to dev_warn

Browse source 
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 <rf@opensource.wolfsonmicro.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
Richard Fitzgerald 2015-10-02 13:29:12 +01:00 • committed by Lee Jones
parent e342427354
commit 161ad30bd2
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/mfd/arizona-core.c
View file

@ -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)
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)
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)
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;
} }