From patchwork Tue Aug 23 23:10:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 9296619 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9B3BB60574 for ; Tue, 23 Aug 2016 23:10:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 69C9A28A29 for ; Tue, 23 Aug 2016 23:10:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5D40928ABC; Tue, 23 Aug 2016 23:10:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D93EF28A29 for ; Tue, 23 Aug 2016 23:10:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933249AbcHWXKp (ORCPT ); Tue, 23 Aug 2016 19:10:45 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:35427 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933247AbcHWXKn (ORCPT ); Tue, 23 Aug 2016 19:10:43 -0400 Received: by mail-pf0-f195.google.com with SMTP id h186so8980566pfg.2 for ; Tue, 23 Aug 2016 16:10:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=yE8WGnma0elGvgOU4aKtfQcZr3WTOKWa/AmrVjG2524=; b=Gn7miXtGeAs9QJRMaTV93LVOOoaUbAB7q9ZJZ27vJwDNJh4ZWpZtaFpVL/1U/FSrir EfqIk+LDLs58/E/tCQAhxveSd4XIYBw5JRKQ6JnAe0ulr5NtZXBkKhYwJz4BLKwMEwAk sYcbiROnjsrvCcbabbgXBJSY475Jrs+qpgL0K27CDwEYYzHqpThzoU6iztgE5z6rbmvh VxNnm61KMcTSkNYBCHSxnLLT1y3puVU/VqW+q+oHEzUb+j1j4wtNQvJkjKl4xseGPdfF W3xb2IzOk3z6qn0FqdR7YvD8XCucM/0SLe0IIy/lnAwlOZDp2gn5RlNTfCavscFGVZcH A9kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=yE8WGnma0elGvgOU4aKtfQcZr3WTOKWa/AmrVjG2524=; b=ajOgpvIruiPiQ6NaA7+joebgtIBRJNnwa+GZI3tZPRzkXXofShH4Edrz8XRw8O1blY qH++YQ9Qf/MdXYo9r7+5mI/iWhu5SwRseK1CqthJarRlUKv7yYF3Au4DocaJof2adida vPcOLPhVthLOPFPi3GuZvmeUeWzygEEmKKiJ7GgLmgJnsMGahnsHW6J2k50TIAxoZb5K la9j5ZVtop1opGqI232LnANq28rR+RYmF0OzNTCA3okkPXMGCyEyvcTyrdHqkS5NE8hZ c3Ne37dAL/Gw4x16Jc7Sts2i/7AaDXauZoT4pBWTBQqdxApTr5h+aUa/p96lt0z8zWeK zJTA== X-Gm-Message-State: AEkoous1zTtuoaVBjPV0XMlAbvF8K1E2NmbD/DZw0/Tr2yv/JGmkiKEdkbZqIngKiUwyEg== X-Received: by 10.98.20.201 with SMTP id 192mr58943653pfu.144.1471993842641; Tue, 23 Aug 2016 16:10:42 -0700 (PDT) Received: from localhost.localdomain.localdomain (ec2-52-192-197-227.ap-northeast-1.compute.amazonaws.com. [52.192.197.227]) by smtp.gmail.com with ESMTPSA id h1sm8188365pay.48.2016.08.23.16.10.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Aug 2016 16:10:42 -0700 (PDT) From: Wei Yongjun To: Peter Ujfalusi , Jarkko Nikula , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai Cc: Wei Yongjun , alsa-devel@alsa-project.org, linux-omap@vger.kernel.org Subject: [PATCH -next] ASoC: omap-abe-twl6040: Use devm_snd_soc_register_card() Date: Tue, 23 Aug 2016 23:10:17 +0000 Message-Id: <1471993817-10903-1-git-send-email-weiyj.lk@gmail.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Wei Yongjun Using devm_snd_soc_register_card() can make the code shorter and cleaner. Signed-off-by: Wei Yongjun Acked-by: Peter Ujfalusi --- sound/soc/omap/omap-abe-twl6040.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c index f61b3b5..89fe95e 100644 --- a/sound/soc/omap/omap-abe-twl6040.c +++ b/sound/soc/omap/omap-abe-twl6040.c @@ -305,23 +305,14 @@ static int omap_abe_probe(struct platform_device *pdev) snd_soc_card_set_drvdata(card, priv); - ret = snd_soc_register_card(card); + ret = devm_snd_soc_register_card(&pdev->dev, card); if (ret) - dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", + dev_err(&pdev->dev, "devm_snd_soc_register_card() failed: %d\n", ret); return ret; } -static int omap_abe_remove(struct platform_device *pdev) -{ - struct snd_soc_card *card = platform_get_drvdata(pdev); - - snd_soc_unregister_card(card); - - return 0; -} - static const struct of_device_id omap_abe_of_match[] = { {.compatible = "ti,abe-twl6040", }, { }, @@ -335,7 +326,6 @@ static struct platform_driver omap_abe_driver = { .of_match_table = omap_abe_of_match, }, .probe = omap_abe_probe, - .remove = omap_abe_remove, }; static int __init omap_abe_init(void)