Merge remote-tracking branches 'asoc/topic/rt298', 'asoc/topic/rt5640…

…', 'asoc/topic/rt5651' and 'asoc/topic/rt5670' into asoc-next
git-mirror · Aug 30, 2015 · a8f1d97 · a8f1d97
5 parents 532161e + 5efe58c + 818454d + 469444f + 387ad57
commit a8f1d97
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/sound/soc/codecs/rt298.c b/sound/soc/codecs/rt298.c
@@ -1144,8 +1144,6 @@ static int rt298_i2c_probe(struct i2c_client *i2c,
 	const struct acpi_device_id *acpiid;
 	int i, ret;
 
-	pr_info("%s\n", __func__);
-
 	rt298 = devm_kzalloc(&i2c->dev,	sizeof(*rt298),
 				GFP_KERNEL);
 	if (NULL == rt298)

diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
@@ -2242,7 +2242,7 @@ static int rt5640_i2c_probe(struct i2c_client *i2c,
 	regmap_read(rt5640->regmap, RT5640_VENDOR_ID2, &val);
 	if (val != RT5640_DEVICE_ID) {
 		dev_err(&i2c->dev,
-			"Device with ID register %x is not rt5640/39\n", val);
+			"Device with ID register %#x is not rt5640/39\n", val);
 		return -ENODEV;
 	}
 

diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c
@@ -1770,7 +1770,7 @@ static int rt5651_i2c_probe(struct i2c_client *i2c,
 	regmap_read(rt5651->regmap, RT5651_DEVICE_ID, &ret);
 	if (ret != RT5651_DEVICE_ID_VALUE) {
 		dev_err(&i2c->dev,
-			"Device with ID register %x is not rt5651\n", ret);
+			"Device with ID register %#x is not rt5651\n", ret);
 		return -ENODEV;
 	}
 

diff --git a/sound/soc/codecs/rt5670.c b/sound/soc/codecs/rt5670.c
@@ -2864,7 +2864,7 @@ static int rt5670_i2c_probe(struct i2c_client *i2c,
 	regmap_read(rt5670->regmap, RT5670_VENDOR_ID2, &val);
 	if (val != RT5670_DEVICE_ID) {
 		dev_err(&i2c->dev,
-			"Device with ID register %x is not rt5670/72\n", val);
+			"Device with ID register %#x is not rt5670/72\n", val);
 		return -ENODEV;
 	}