Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 161ad30b authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Lee Jones
Browse files

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: default avatarRichard Fitzgerald <rf@opensource.wolfsonmicro.com>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent e3424273

drivers/mfd/arizona-core.c

+8 −8
Original line number Diff line number Diff line
@@ -1130,7 +1130,7 @@ 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",

			dev_warn(arizona->dev, "WM5102 registered as %d\n",

				 arizona->type);

			arizona->type = WM5102;

		}
@@ -1149,7 +1149,7 @@ int arizona_dev_init(struct arizona *arizona) 
			break;

		default:

			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 = WM5110;

			break;
@@ -1161,7 +1161,7 @@ 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",

			dev_warn(arizona->dev, "WM8997 registered as %d\n",

				 arizona->type);

			arizona->type = WM8997;

		}
@@ -1181,7 +1181,7 @@ int arizona_dev_init(struct arizona *arizona) 


		default:

			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 = WM8998;

		}