From patchwork Fri May 3 09:09:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 16618 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f198.google.com (mail-qc0-f198.google.com [209.85.216.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E10B623905 for ; Fri, 3 May 2013 09:22:43 +0000 (UTC) Received: by mail-qc0-f198.google.com with SMTP id f15sf2102626qcs.5 for ; Fri, 03 May 2013 02:22:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=OCpO4Lo2vCTbqczWckFOtr+Bz+AaPxSDmvaIBkR8gwM=; b=QEdg9djm5ftaW9wYSmpbHWiCk2sP6WZnNnkkL/Z95dnaZ0U/lG9ooXr5q0z5xQgEeY 9LkMlYwSO+Sd65dAzV8xRAaQv7s0IiGY7ol3/zjkaYvkBFH1pnVK+EYYrCSvODXfzLeB ZqB4Z+7UfvLIcgyqMpFnCUR9eIi1uoVU1T+ASJUPC1Z/bwiopQapupFDGBIKqzHYWJFg 1tVLNw+x8dRi+APq/jod/RHoNRErbL2NT46OYToZDWIZskOn9zGL/NWMHPQiaxtxZnSc rnh214ZLWdcHkHeQ38ipoFeA65eV66oyeL7jSXZS0TUrE7hvBq1yTXmHFaV14Y0lGtHg EcFQ== X-Received: by 10.236.203.134 with SMTP id f6mr7668297yho.46.1367572954521; Fri, 03 May 2013 02:22:34 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.94.44 with SMTP id cz12ls1709409qeb.67.gmail; Fri, 03 May 2013 02:22:34 -0700 (PDT) X-Received: by 10.58.75.46 with SMTP id z14mr3371695vev.52.1367572954258; Fri, 03 May 2013 02:22:34 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id k19si4727301vcu.60.2013.05.03.02.22.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 03 May 2013 02:22:34 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id ht11so1248668vcb.4 for ; Fri, 03 May 2013 02:22:34 -0700 (PDT) X-Received: by 10.58.173.36 with SMTP id bh4mr3426496vec.9.1367572954031; Fri, 03 May 2013 02:22:34 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp13221veb; Fri, 3 May 2013 02:22:33 -0700 (PDT) X-Received: by 10.68.13.168 with SMTP id i8mr12974228pbc.86.1367572953110; Fri, 03 May 2013 02:22:33 -0700 (PDT) Received: from mail-pd0-f173.google.com (mail-pd0-f173.google.com [209.85.192.173]) by mx.google.com with ESMTPS id pt2si6841668pbb.109.2013.05.03.02.22.32 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 03 May 2013 02:22:33 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.192.173 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.192.173; Received: by mail-pd0-f173.google.com with SMTP id v10so830075pde.4 for ; Fri, 03 May 2013 02:22:32 -0700 (PDT) X-Received: by 10.66.251.133 with SMTP id zk5mr13791994pac.26.1367572952743; Fri, 03 May 2013 02:22:32 -0700 (PDT) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id ea15sm12070993pad.16.2013.05.03.02.22.29 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 03 May 2013 02:22:32 -0700 (PDT) From: Sachin Kamat To: alsa-devel@alsa-project.org Cc: broonie@kernel.org, tiwai@suse.de, sachin.kamat@linaro.org, patches@linaro.org, Haojian Zhuang Subject: [PATCH 5/6] ASoC: 88pm860x: Remove redundant platform_set_drvdata() Date: Fri, 3 May 2013 14:39:23 +0530 Message-Id: <1367572164-19523-5-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1367572164-19523-1-git-send-email-sachin.kamat@linaro.org> References: <1367572164-19523-1-git-send-email-sachin.kamat@linaro.org> X-Gm-Message-State: ALoCoQn0AgNVWMyCeNO6IzJ4bfKbFvjHla++NzfORNv7abZPXmBD9+YD3Lu2aemmiyIl7UxZpU2p X-Original-Sender: sachin.kamat@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Commit 0998d06310 (device-core: Ensure drvdata = NULL when no driver is bound) removes the need to set driver data field to NULL. Signed-off-by: Sachin Kamat Cc: Haojian Zhuang Acked-by: Haojian Zhuang --- sound/soc/codecs/88pm860x-codec.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c index 60159c0..1382f3f 100644 --- a/sound/soc/codecs/88pm860x-codec.c +++ b/sound/soc/codecs/88pm860x-codec.c @@ -1444,7 +1444,7 @@ static int pm860x_codec_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_IRQ, i); if (!res) { dev_err(&pdev->dev, "Failed to get IRQ resources\n"); - goto out; + return -EINVAL; } pm860x->irq[i] = res->start + chip->irq_base; strncpy(pm860x->name[i], res->name, MAX_NAME_LEN); @@ -1454,19 +1454,14 @@ static int pm860x_codec_probe(struct platform_device *pdev) pm860x_dai, ARRAY_SIZE(pm860x_dai)); if (ret) { dev_err(&pdev->dev, "Failed to register codec\n"); - goto out; + return -EINVAL; } return ret; - -out: - platform_set_drvdata(pdev, NULL); - return -EINVAL; } static int pm860x_codec_remove(struct platform_device *pdev) { snd_soc_unregister_codec(&pdev->dev); - platform_set_drvdata(pdev, NULL); return 0; }