Merge remote-tracking branches 'asoc/topic/wm8741', 'asoc/topic/wm8753', 'asoc/topic...

[deliverable/linux.git] / sound / soc / codecs / sti-sas.c

diff --git a/sound/soc/codecs/sti-sas.c b/sound/soc/codecs/sti-sas.c
index 6c0bbe8b495e0318704e44b687752b1f42537525..160d61a66204b25db880c0e7eb7618344026e81e 100644 (file)
--- a/sound/soc/codecs/sti-sas.c
+++ b/sound/soc/codecs/sti-sas.c
@@ -227,8 +227,8 @@ static int stih416_dac_probe(struct snd_soc_dai *dai)
        dac->rst = devm_reset_control_get(codec->dev, "dac_rst");
        if (IS_ERR(dac->rst)) {
                dev_err(dai->codec->dev,
-                       "%s: ERROR: DAC reset control not defined (%d)!\n",
-                       __func__, (int)dac->rst);
+                       "%s: ERROR: DAC reset control not defined !\n",
+                       __func__);
                dac->rst = NULL;
                return -EFAULT;
        }
@@ -547,6 +547,7 @@ static int sti_sas_driver_probe(struct platform_device *pdev)
 {
        struct device_node *pnode = pdev->dev.of_node;
        struct sti_sas_data *drvdata;
+       const struct of_device_id *of_id;
 
        /* Allocate device structure */
        drvdata = devm_kzalloc(&pdev->dev, sizeof(struct sti_sas_data),
@@ -555,12 +556,13 @@ static int sti_sas_driver_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        /* Populate data structure depending on compatibility */
-       if (!of_match_node(sti_sas_dev_match, pnode)->data) {
+       of_id = of_match_node(sti_sas_dev_match, pnode);
+       if (!of_id->data) {
                dev_err(&pdev->dev, "data associated to device is missing");
                return -EINVAL;
        }
 
-       drvdata->dev_data = of_match_node(sti_sas_dev_match, pnode)->data;
+       drvdata->dev_data = (struct sti_sas_dev_data *)of_id->data;
 
        /* Initialise device structure */
        drvdata->dev = &pdev->dev;
@@ -613,7 +615,6 @@ static int sti_sas_driver_remove(struct platform_device *pdev)
 static struct platform_driver sti_sas_platform_driver = {
        .driver = {
                .name = "sti-sas-codec",
-               .owner = THIS_MODULE,
                .of_match_table = sti_sas_dev_match,
        },
        .probe = sti_sas_driver_probe,