From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932292AbbE0TWr (ORCPT ); Wed, 27 May 2015 15:22:47 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:42279 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753702AbbE0TBT (ORCPT ); Wed, 27 May 2015 15:01:19 -0400 From: Kamal Mostafa To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Cc: Manish Badarkhe , Jyri Sarha , Mark Brown , Kamal Mostafa Subject: [PATCH 3.13.y-ckt 24/95] ASoC: davinci-evm: drop un-necessary remove function Date: Wed, 27 May 2015 11:59:32 -0700 Message-Id: <1432753243-16151-25-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1432753243-16151-1-git-send-email-kamal@canonical.com> References: <1432753243-16151-1-git-send-email-kamal@canonical.com> X-Extended-Stable: 3.13 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.13.11-ckt21 -stable review patch. If anyone has any objections, please let me know. ------------------ From: Manish Badarkhe commit a57069e33fbc6625f39e1b09c88ea44629a35206 upstream. As davinci card gets registered using 'devm_' api there is no need to unregister the card in 'remove' function. Hence drop the 'remove' function. Fixes: ee2f615d6e59c (ASoC: davinci-evm: Add device tree binding) Signed-off-by: Manish Badarkhe Signed-off-by: Jyri Sarha Signed-off-by: Mark Brown Signed-off-by: Kamal Mostafa --- sound/soc/davinci/davinci-evm.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c index 623eb5e..23123e8 100644 --- a/sound/soc/davinci/davinci-evm.c +++ b/sound/soc/davinci/davinci-evm.c @@ -396,18 +396,8 @@ static int davinci_evm_probe(struct platform_device *pdev) return ret; } -static int davinci_evm_remove(struct platform_device *pdev) -{ - struct snd_soc_card *card = platform_get_drvdata(pdev); - - snd_soc_unregister_card(card); - - return 0; -} - static struct platform_driver davinci_evm_driver = { .probe = davinci_evm_probe, - .remove = davinci_evm_remove, .driver = { .name = "davinci_evm", .owner = THIS_MODULE, -- 1.9.1