Re: [alsa-devel] [PATCH 4/6] ASoC: tegra_alc5632: assume CONFIG_OF, and other cleanup

On Sat, Feb 16, 2013 at 2:07 AM, Stephen Warren swarren@wwwdotorg.org wrote:

From: Stephen Warren swarren@nvidia.com

Tegra only supports, and always enables, device tree. Remove all runtime checks for DT support from the driver.

Also, various minor cleanups so that the probe() body more closely resembles other drivers, for easier comparison.

Signed-off-by: Stephen Warren swarren@nvidia.com

sound/soc/tegra/tegra_alc5632.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)

Thanks.

diff --git a/sound/soc/tegra/tegra_alc5632.c b/sound/soc/tegra/tegra_alc5632.c index c80adb9..48d05d9 100644 --- a/sound/soc/tegra/tegra_alc5632.c +++ b/sound/soc/tegra/tegra_alc5632.c @@ -161,20 +161,13 @@ static int tegra_alc5632_probe(struct platform_device *pdev) sizeof(struct tegra_alc5632), GFP_KERNEL); if (!alc5632) { dev_err(&pdev->dev, "Can't allocate tegra_alc5632\n");

•           ret = -ENOMEM;
  

•           goto err;
  

•           return -ENOMEM;
    }
  
    card->dev = &pdev->dev;
    platform_set_drvdata(pdev, card);
    snd_soc_card_set_drvdata(card, alc5632);
  
  

•   if (!(pdev->dev.of_node)) {
  

•           dev_err(&pdev->dev, "Must be instantiated using device
  

tree\n");

•           ret = -EINVAL;
  

•           goto err;
  

•   }
  

•   alc5632->gpio_hp_det = of_get_named_gpio(np,
  

"nvidia,hp-det-gpios", 0); if (alc5632->gpio_hp_det == -EPROBE_DEFER) return -EPROBE_DEFER; @@ -197,11 +190,11 @@ static int tegra_alc5632_probe(struct platform_device *pdev) goto err; }

•   tegra_alc5632_dai.cpu_of_node = of_parse_phandle(
  

•                   pdev->dev.of_node, "nvidia,i2s-controller", 0);
  

•   tegra_alc5632_dai.cpu_of_node = of_parse_phandle(np,
  

•                   "nvidia,i2s-controller", 0);
    if (!tegra_alc5632_dai.cpu_of_node) {
            dev_err(&pdev->dev,
  

•           "Property 'nvidia,i2s-controller' missing or invalid\n");
  

•                   "Property 'nvidia,i2s-controller' missing or
  

invalid\n"); ret = -EINVAL; goto err; } -- 1.7.10.4

-- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

-- Leon Romanovsky | Independent Linux Consultant www.leon.nu | leon@leon.nu