Merge remote-tracking branches 'asoc/topic/cs42l73', 'asoc/topic/cs47l24', 'asoc...

[sfrench/cifs-2.6.git] / sound / soc / codecs / da7213.c

diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c
index 41d9b1da27c221272b54ad20846fb5cde3ee76ca..b2b4e90fc02adc5c25d9aa5511e360eaa0b4c76d 100644 (file)
--- a/sound/soc/codecs/da7213.c
+++ b/sound/soc/codecs/da7213.c
@@ -1654,10 +1654,8 @@ static struct da7213_platform_data
        u32 fw_val32;
 
        pdata = devm_kzalloc(codec->dev, sizeof(*pdata), GFP_KERNEL);
-       if (!pdata) {
-               dev_warn(codec->dev, "Failed to allocate memory for pdata\n");
+       if (!pdata)
                return NULL;
-       }
 
        if (device_property_read_u32(dev, "dlg,micbias1-lvl", &fw_val32) >= 0)
                pdata->micbias1_lvl = da7213_of_micbias_lvl(codec, fw_val32);
@@ -1855,8 +1853,7 @@ static int da7213_i2c_probe(struct i2c_client *i2c,
        struct da7213_priv *da7213;
        int ret;
 
-       da7213 = devm_kzalloc(&i2c->dev, sizeof(struct da7213_priv),
-                             GFP_KERNEL);
+       da7213 = devm_kzalloc(&i2c->dev, sizeof(*da7213), GFP_KERNEL);
        if (!da7213)
                return -ENOMEM;