From patchwork Tue Apr 11 19:15:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 97276 Delivered-To: patches@linaro.org Received: by 10.140.109.52 with SMTP id k49csp101784qgf; Tue, 11 Apr 2017 12:15:25 -0700 (PDT) X-Received: by 10.98.218.76 with SMTP id w12mr62591301pfl.162.1491938125631; Tue, 11 Apr 2017 12:15:25 -0700 (PDT) Return-Path: Received: from mail-pg0-x22c.google.com (mail-pg0-x22c.google.com. [2607:f8b0:400e:c05::22c]) by mx.google.com with ESMTPS id d5si17702370pgh.317.2017.04.11.12.15.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Apr 2017 12:15:25 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c05::22c as permitted sender) client-ip=2607:f8b0:400e:c05::22c; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c05::22c as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by mail-pg0-x22c.google.com with SMTP id 21so3012197pgg.1 for ; Tue, 11 Apr 2017 12:15:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=jfpda2ER7naUCkUKqVQexkhR05gatZqhT5PJ0yOqHj0=; b=O58UK7Uq3FmwFEY7PUX9/5oPrk/xcg/q0o7l9qUf9Y0KZmSA3MN26eFjqaQIrY9q2Y LqbvWSgWXRN6kFxeYFFqBmweK/FKKBbONk78zuragMRCwJaNABiDjAJVnwWSxzVH+gvP JF1Sri/lXsmFaK0a8itHs7RxSZ1F0PTwtssag= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=jfpda2ER7naUCkUKqVQexkhR05gatZqhT5PJ0yOqHj0=; b=Vu1Udag1PoVEjLG4ELGbz2kNjmBNstwjfale/6eTYEd+8g4T+7CtDs00pBCSY3lfvf 8cRwJr9xD04Xdb0aLYl6sNtVN6vN/ogSL8aAK0a/5BtmPawb1A5Mg+23CPu910oev2GU VTJBWYl8Tma1T1Qz7AaXz8VQoOFZbItY2XVB1R/ffCaGR4SlrgCV6OXcT9wcIYAnIAr0 M8yfEOszzCOkwqT/iorVR/OHF+AWZqANwfwCxCyqd6A/z//XqzwzU9yCaIzG0jcDwamK bTsFFjFDlWDWkDqY0Z4VXLbYcnbpMRUvsSYnv4btvwiduSLNCBCdT60Uz3EXXH1UpyWS 0Nzw== X-Gm-Message-State: AFeK/H36UZYxdmDwV+9Imu4h4seBf0Mzu9XRqGHQGzJCAYAfE4aDDzWU6vUWFmsOH2iFmcZcW4k= X-Received: by 10.84.239.8 with SMTP id w8mr77101704plk.73.1491938125262; Tue, 11 Apr 2017 12:15:25 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:1002:83f0:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id y184sm32033726pgd.41.2017.04.11.12.15.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 11 Apr 2017 12:15:24 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Zhangfei Gao , Liam Girdwood , Mark Brown , Jaroslav Kysela , Wei Xu , Rob Herring , Andy Green , Dave Long , Guodong Xu Subject: [PATCH 1/3] ASoC: hisilicon: Add error returns even for cases that shouldn't happen. Date: Tue, 11 Apr 2017 12:15:16 -0700 Message-Id: <1491938118-19108-1-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 This patch addresses feedback from Mark Brown, adding a few extra error returns in cases that shouldn't happen Cc: Zhangfei Gao Cc: Liam Girdwood Cc: Mark Brown Cc: Jaroslav Kysela Cc: Wei Xu Cc: Rob Herring Cc: Andy Green Cc: Dave Long Cc: Guodong Xu Signed-off-by: John Stultz --- sound/soc/hisilicon/hi6210-i2s.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.7.4 diff --git a/sound/soc/hisilicon/hi6210-i2s.c b/sound/soc/hisilicon/hi6210-i2s.c index 45691b70..1909bfc 100644 --- a/sound/soc/hisilicon/hi6210-i2s.c +++ b/sound/soc/hisilicon/hi6210-i2s.c @@ -395,6 +395,7 @@ static int hi6210_i2s_hw_params(struct snd_pcm_substream *substream, break; default: WARN_ONCE(1, "Invalid i2s->fmt MASTER_MASK. This shouldn't happen\n"); + return -EINVAL; } switch (i2s->format & SND_SOC_DAIFMT_FORMAT_MASK) { @@ -409,6 +410,7 @@ static int hi6210_i2s_hw_params(struct snd_pcm_substream *substream, break; default: WARN_ONCE(1, "Invalid i2s->fmt FORMAT_MASK. This shouldn't happen\n"); + return -EINVAL; } val = hi6210_read_reg(i2s, HII2S_I2S_CFG); From patchwork Tue Apr 11 19:15:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 97277 Delivered-To: patches@linaro.org Received: by 10.140.109.52 with SMTP id k49csp101792qgf; Tue, 11 Apr 2017 12:15:27 -0700 (PDT) X-Received: by 10.98.96.65 with SMTP id u62mr61886906pfb.219.1491938127016; Tue, 11 Apr 2017 12:15:27 -0700 (PDT) Return-Path: Received: from mail-pf0-x234.google.com (mail-pf0-x234.google.com. [2607:f8b0:400e:c00::234]) by mx.google.com with ESMTPS id d14si10248683pln.263.2017.04.11.12.15.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Apr 2017 12:15:27 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c00::234 as permitted sender) client-ip=2607:f8b0:400e:c00::234; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c00::234 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by mail-pf0-x234.google.com with SMTP id i5so2782098pfc.2 for ; Tue, 11 Apr 2017 12:15:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Flpi02Fz70e9Px2p7x/UFSMgFKzGgpU5oXbZy8ATATM=; b=Recq6DeLqiYcbm7eeYuTdv7dkFGb3aALTUy6QHChMGeaxbXRaww6tEDKfT/wXT2Lcb lg7RwP+atxJkZweoHO+80E4qvv/XR1SBv5zSHjCbDCH/0y5gsjqOPlIoLtxaxMM50H2B anAq4bqrwWugttuDJL5Eo9FCNcpBMSvMJcO6I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Flpi02Fz70e9Px2p7x/UFSMgFKzGgpU5oXbZy8ATATM=; b=U27xbz61ERMEx58YJ5SEYhTh4r777W2FqZ883BbART7B78gmmgJ4TI3sAOQHh36neg PxtNpJZhECIVkKzyTFcv11mD/XU/l9ObBeTXR2shUObPMFSQmpAIANyza4l24keJodAz UEdBdKa6hb2vegRwkrJIz6K0LlAVWQq0Z3uSyM0cgzBvCExyasU3lztaMUIhwmHYyg5m cla1aXP4TfZiMgvrBsfCnkGVnUMWjS50FVQSZfcNg/lkRsu0mAxS8IMFmtCYMMrmom5r RLBpOqghS2f64b2i00X5OpUmYn40H+eBQPmW+3nGIa3+TsVAB7EBFUp1PqYBVsViFuZC s9Dg== X-Gm-Message-State: AFeK/H1mw+0enCQ0zMIetha943mOvBdW6GcPe00aC5xV5Jp1LNTjrU81usUUZkCwdCa4gt7czaE= X-Received: by 10.84.177.36 with SMTP id w33mr77510169plb.105.1491938126710; Tue, 11 Apr 2017 12:15:26 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:1002:83f0:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id y184sm32033726pgd.41.2017.04.11.12.15.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 11 Apr 2017 12:15:25 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Zhangfei Gao , Liam Girdwood , Mark Brown , Jaroslav Kysela , Wei Xu , Rob Herring , Andy Green , Dave Long , Guodong Xu Subject: [PATCH 2/3] ASoC: hisilicon: Address style nit to use break in final default of switch statement Date: Tue, 11 Apr 2017 12:15:17 -0700 Message-Id: <1491938118-19108-2-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491938118-19108-1-git-send-email-john.stultz@linaro.org> References: <1491938118-19108-1-git-send-email-john.stultz@linaro.org> Mark Brown suggested a style change to use break in the final default of a switch statement, so this patch addresses that. Cc: Zhangfei Gao Cc: Liam Girdwood Cc: Mark Brown Cc: Jaroslav Kysela Cc: Wei Xu Cc: Rob Herring Cc: Andy Green Cc: Dave Long Cc: Guodong Xu Signed-off-by: John Stultz --- sound/soc/hisilicon/hi6210-i2s.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.7.4 diff --git a/sound/soc/hisilicon/hi6210-i2s.c b/sound/soc/hisilicon/hi6210-i2s.c index 1909bfc..27553dc 100644 --- a/sound/soc/hisilicon/hi6210-i2s.c +++ b/sound/soc/hisilicon/hi6210-i2s.c @@ -324,6 +324,7 @@ static int hi6210_i2s_hw_params(struct snd_pcm_substream *substream, default: i2s->bits = 16; dma_data->addr_width = 2; + break; } i2s->rate = params_rate(params); i2s->channels = params_channels(params); @@ -442,6 +443,7 @@ static int hi6210_i2s_hw_params(struct snd_pcm_substream *substream, val = hi6210_read_reg(i2s, HII2S_I2S_CFG); val &= ~HII2S_I2S_CFG__S2_FRAME_MODE; hi6210_write_reg(i2s, HII2S_I2S_CFG, val); + break; } /* clear loopback, set signed type and word length */ From patchwork Tue Apr 11 19:15:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 97278 Delivered-To: patches@linaro.org Received: by 10.140.109.52 with SMTP id k49csp101799qgf; Tue, 11 Apr 2017 12:15:28 -0700 (PDT) X-Received: by 10.84.215.218 with SMTP id g26mr20319238plj.22.1491938128700; Tue, 11 Apr 2017 12:15:28 -0700 (PDT) Return-Path: Received: from mail-pf0-x235.google.com (mail-pf0-x235.google.com. [2607:f8b0:400e:c00::235]) by mx.google.com with ESMTPS id e4si5717947pfl.271.2017.04.11.12.15.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Apr 2017 12:15:28 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c00::235 as permitted sender) client-ip=2607:f8b0:400e:c00::235; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c00::235 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by mail-pf0-x235.google.com with SMTP id c198so2804528pfc.1 for ; Tue, 11 Apr 2017 12:15:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1cUU8kW3Ju4B2Bkg1mGM4fYbERu1+M3jJxg7oitcL3s=; b=jmaplgQuUkXLmIgMQynt7LIJ8C9U8kuHfUs/0qgdGW7GjsltdDlwb30s9jv64j+lyY hVURRGr0tfS5HmACkoaGcQ185Bv1cjFaPzf3DitM6Ea60t590o6NHTiqjPH0rHplerm7 eV3/YH0yaj9r6yqFvWLfSVh7+AeupsX13asFw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1cUU8kW3Ju4B2Bkg1mGM4fYbERu1+M3jJxg7oitcL3s=; b=J7m5MPmOsSviPoGicUikHH3SN4TawxqqbA0ajq0xDN/ceaJR89AgX9a4vQPYdcGx77 /QAMgCECWoCKoosMSmoEyfStzfW9C8yN++0xu/emnzdGUKHsCkr0ctxVlQOadGvdMCB5 GwTFBivt2u1Kzjhqx+JtiRagY622cTbff8JDuhwgnKAK4zB6z/N3epGs4upAYrN4oN5G i15T4PrrJJqyuGvRRwLxv+GsjlTOoVzRoYm9GY4lNEr3RByxDU4+1m13t7saumuRGMIf dxwLnSaBqnYYDaCRyqER7LrBg8pdffspi5ks1TH4XLtprlhsT7opO8hhAlSZmL8IXxkS k5kg== X-Gm-Message-State: AN3rC/4F6wluL+NQCD4jHB0s7SDj5xnynIOwuHq91d2PCUyCBrRG4mXCEgMqlp/l/wJB13memgc= X-Received: by 10.84.193.3 with SMTP id e3mr32836093pld.71.1491938128437; Tue, 11 Apr 2017 12:15:28 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:1002:83f0:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id y184sm32033726pgd.41.2017.04.11.12.15.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 11 Apr 2017 12:15:27 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Zhangfei Gao , Liam Girdwood , Mark Brown , Jaroslav Kysela , Wei Xu , Rob Herring , Andy Green , Dave Long , Guodong Xu Subject: [PATCH 3/3] ASoC: hisilicon: Use devm_snd_soc_register_component Date: Tue, 11 Apr 2017 12:15:18 -0700 Message-Id: <1491938118-19108-3-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491938118-19108-1-git-send-email-john.stultz@linaro.org> References: <1491938118-19108-1-git-send-email-john.stultz@linaro.org> Per feedback from Mark Brown, this patch updates the hi6210-i2s driver to use devm_snd_soc_register_component which simplifies the logic a bit. Cc: Zhangfei Gao Cc: Liam Girdwood Cc: Mark Brown Cc: Jaroslav Kysela Cc: Wei Xu Cc: Rob Herring Cc: Andy Green Cc: Dave Long Cc: Guodong Xu Signed-off-by: John Stultz --- sound/soc/hisilicon/hi6210-i2s.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) -- 2.7.4 diff --git a/sound/soc/hisilicon/hi6210-i2s.c b/sound/soc/hisilicon/hi6210-i2s.c index 27553dc..45163e5 100644 --- a/sound/soc/hisilicon/hi6210-i2s.c +++ b/sound/soc/hisilicon/hi6210-i2s.c @@ -591,22 +591,9 @@ static int hi6210_i2s_probe(struct platform_device *pdev) if (ret) return ret; - ret = snd_soc_register_component(&pdev->dev, &hi6210_i2s_i2s_comp, + ret = devm_snd_soc_register_component(&pdev->dev, &hi6210_i2s_i2s_comp, &i2s->dai, 1); - if (ret) { - dev_err(&pdev->dev, "Failed to register dai\n"); - return ret; - } - - return 0; -} - -static int hi6210_i2s_remove(struct platform_device *pdev) -{ - snd_soc_unregister_component(&pdev->dev); - dev_set_drvdata(&pdev->dev, NULL); - - return 0; + return ret; } static const struct of_device_id hi6210_i2s_dt_ids[] = { @@ -618,7 +605,6 @@ MODULE_DEVICE_TABLE(of, hi6210_i2s_dt_ids); static struct platform_driver hi6210_i2s_driver = { .probe = hi6210_i2s_probe, - .remove = hi6210_i2s_remove, .driver = { .name = "hi6210_i2s", .of_match_table = hi6210_i2s_dt_ids,