From patchwork Mon Jul 15 10:27:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 19275 X-Patchwork-Delegate: kamil@wypas.org Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1UygFC-00064P-22; Mon, 15 Jul 2013 12:43:02 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-5) with esmtp id 1UygFA-0005Ai-6Z; Mon, 15 Jul 2013 12:43:01 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755189Ab3GOKm6 (ORCPT + 1 other); Mon, 15 Jul 2013 06:42:58 -0400 Received: from mail-pb0-f48.google.com ([209.85.160.48]:41212 "EHLO mail-pb0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755106Ab3GOKm6 (ORCPT ); Mon, 15 Jul 2013 06:42:58 -0400 Received: by mail-pb0-f48.google.com with SMTP id ma3so11091393pbc.35 for ; Mon, 15 Jul 2013 03:42:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=i1qCQUfXlfIXonHJrcDRn55toRnYcBxwmXXLY89cTQo=; b=djlojoN/QMsZNlUy6QH0RpnLKIrUKwAk2ifH/IhOb0fnUSteCYfORiv4r+i8sLSePd onk6nej3fAcnDHpIoxp9NjEdQjx4FAmk3ZFsColZ4VcMzursub31t5/da+CKdJH1Q9ba cItMcndtW3PD9FN2NE9DK85bebmMw3KLmGLpTMpORLP+DZ6RSUcc3OE0A7pG+3rSDOER 4PRRKg45ZIWVOyFhSYFLtmb2UjRVEAfJtakQTWjvMDdzjLxpL8THluoH1RyMStW2uVVv ijYt6/TUX04+1udTqaOPQV3Yzfc9bczB7E8Xo5ZwC8Gy/PrLL0rNHb/Z5hhxJsFWdNfi KaFw== X-Received: by 10.68.217.7 with SMTP id ou7mr53095489pbc.8.1373884977690; Mon, 15 Jul 2013 03:42:57 -0700 (PDT) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id td4sm63807246pac.20.2013.07.15.03.42.54 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 15 Jul 2013 03:42:57 -0700 (PDT) From: Sachin Kamat To: linux-media@vger.kernel.org Cc: g.liakhovetski@gmx.de, rusty@rustcorp.com.au, sachin.kamat@linaro.org, patches@linaro.org Subject: [PATCH 1/1] [media] sh_veu: Replace PTR_RET with PTR_ERR_OR_ZERO Date: Mon, 15 Jul 2013 15:57:07 +0530 Message-Id: <1373884027-24846-1-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-Gm-Message-State: ALoCoQlfv/aq/rMkwj+y1ZLRYUR9+jq56qCbWUcjk83xmGlPKJdq9ynhTp3gLljj1apbQaSSGw+R Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2013.7.15.103317 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1100_1199 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' PTR_RET is now deprecated. Use PTR_ERR_OR_ZERO instead. Signed-off-by: Sachin Kamat --- Compile tested and based on the following tree: git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git (PTR_RET) Dependent on [1] [1] http://lkml.indiana.edu/hypermail/linux/kernel/1306.2/00010.html --- drivers/media/platform/sh_veu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/sh_veu.c b/drivers/media/platform/sh_veu.c index aa4cca3..744e43b 100644 --- a/drivers/media/platform/sh_veu.c +++ b/drivers/media/platform/sh_veu.c @@ -359,7 +359,7 @@ static int sh_veu_context_init(struct sh_veu_dev *veu) veu->m2m_ctx = v4l2_m2m_ctx_init(veu->m2m_dev, veu, sh_veu_queue_init); - return PTR_RET(veu->m2m_ctx); + return PTR_ERR_OR_ZERO(veu->m2m_ctx); } static int sh_veu_querycap(struct file *file, void *priv,