From patchwork Tue Jun 9 13:35:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 6572691 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: X-Original-To: patchwork-linux-arm-msm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E914AC0020 for ; Tue, 9 Jun 2015 13:35:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0CF7420434 for ; Tue, 9 Jun 2015 13:35:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6E79420489 for ; Tue, 9 Jun 2015 13:35:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932537AbbFINfe (ORCPT ); Tue, 9 Jun 2015 09:35:34 -0400 Received: from mail-wg0-f45.google.com ([74.125.82.45]:33143 "EHLO mail-wg0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932539AbbFINfc (ORCPT ); Tue, 9 Jun 2015 09:35:32 -0400 Received: by wgez8 with SMTP id z8so13671331wge.0 for ; Tue, 09 Jun 2015 06:35:31 -0700 (PDT) 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:in-reply-to :references; bh=Alb7Embs8AiRNTo9AOPrlmlVl+zeWEtxPvdyYW7ehO4=; b=GDgpdmzgs6GKOhEGWRGFZ3LaQfEmLZ0lOoJw6Sm183EPtWjyex7EZAf7MvB8yGMVIK c1yDcox14fNx8FpD8rVAHdtqia9aJp9IzmVVW4Tg1XoFgvm6dbM3RbBdTTMgOeS8DRZm DtAZevIwIgsOvxrnUZ66v0BhefkosBn+7Iakv73344DhfzF38Y5o7J8OLeY8ASaW5rN+ bn7vSC9SS/xr/ONHucMwUFBiN+MBtzprucUJeAkm7sKy2s85ZjpG2sAXPlz2mgSaCnf2 uQ1sJs7qHes3avctazcSugDs2088pCveDzZDG5XnNlqts11sYural31NWBb8dwogilog Q/hw== X-Gm-Message-State: ALoCoQn4v7H04YvIpCDbQ1MkJdvjERXHnY9q9TCj6TO5SKsVwYYXSUlEJ6Zps8z6fpC9eozU9xZs X-Received: by 10.180.36.103 with SMTP id p7mr32379386wij.88.1433856931260; Tue, 09 Jun 2015 06:35:31 -0700 (PDT) Received: from srini-ThinkPad-X1-Carbon-2nd.dlink.com (host-2-99-231-135.as13285.net. [2.99.231.135]) by mx.google.com with ESMTPSA id nb9sm2893721wic.10.2015.06.09.06.35.26 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 09 Jun 2015 06:35:30 -0700 (PDT) From: Srinivas Kandagatla To: Patrick Lai , Mark Brown , kwestfie@codeaurora.org Cc: Rob Herring , Banajit Goswami , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org, linux-arm-msm@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH 2/2] ASoC: qcom: storm: remove special casing EPROBE_DEFER Date: Tue, 9 Jun 2015 14:35:22 +0100 Message-Id: <1433856922-15541-1-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1433856861-15433-1-git-send-email-srinivas.kandagatla@linaro.org> References: <1433856861-15433-1-git-send-email-srinivas.kandagatla@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch removes special casing the EPROBE_DEFER error handling in the driver. Signed-off-by: Srinivas Kandagatla --- sound/soc/qcom/storm.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sound/soc/qcom/storm.c b/sound/soc/qcom/storm.c index ee06613..2d833bf 100644 --- a/sound/soc/qcom/storm.c +++ b/sound/soc/qcom/storm.c @@ -122,15 +122,12 @@ static int storm_platform_probe(struct platform_device *pdev) } ret = devm_snd_soc_register_card(&pdev->dev, card); - if (ret == -EPROBE_DEFER) { - return ret; - } else if (ret) { + if (ret) dev_err(&pdev->dev, "%s() error registering soundcard: %d\n", __func__, ret); - return ret; - } - return 0; + return ret; + } #ifdef CONFIG_OF