From patchwork Mon Jan 27 06:43:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 23735 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f200.google.com (mail-qc0-f200.google.com [209.85.216.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C547C21330 for ; Mon, 27 Jan 2014 06:48:38 +0000 (UTC) Received: by mail-qc0-f200.google.com with SMTP id e9sf10708285qcy.11 for ; Sun, 26 Jan 2014 22:48:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=TCqMR/7A+XDdnxNY5Hu+VnTf1hgah2kDVvCNRxWvtMY=; b=ak2f5gZFPv/bgk5iKFlnG2MO6uR/ygjOVgZm0IZWjc/3EAHqy4o3A8LGt5/rGdo6fv Vuq4OVfbwP9EyYmBF+JpR+ffVrY4zu3nCbnC3AVtceDAirNEzCLF1uuc6zSYZW7Wzn1+ SfIG8VuVb5Fvvng8d5pDQBfr6Y6P+IJ9v2Vl0slgTWWpfbvCHuu4RKwxduk4qKzAEPuy ISI4486X8T9SP6IVmjc7QnLN9NgC5R2xIiskK02GpTQTS0zghObfFQlfWF1bKFXQ2EWQ Gx3mrBThHt9otw8JHRwAkd2OucazIbuRHXuQYFDmSbiavEEI5bpVEGH8IW5BG9bbx9wq fZmQ== X-Gm-Message-State: ALoCoQn6v26Vl/eKZQkXpTE2oVnsD+hsesnr1f7jwUfJA2v6VjP8KvVmxSUxghgxW1SRvFhhNwDy X-Received: by 10.236.139.116 with SMTP id b80mr8290550yhj.30.1390805317546; Sun, 26 Jan 2014 22:48:37 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.20.100 with SMTP id 91ls1596942qgi.18.gmail; Sun, 26 Jan 2014 22:48:37 -0800 (PST) X-Received: by 10.52.30.77 with SMTP id q13mr2464168vdh.18.1390805317438; Sun, 26 Jan 2014 22:48:37 -0800 (PST) Received: from mail-vb0-f51.google.com (mail-vb0-f51.google.com [209.85.212.51]) by mx.google.com with ESMTPS id a15si4754937vew.121.2014.01.26.22.48.37 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 26 Jan 2014 22:48:37 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.51 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.51; Received: by mail-vb0-f51.google.com with SMTP id 11so3128136vbe.38 for ; Sun, 26 Jan 2014 22:48:37 -0800 (PST) X-Received: by 10.52.253.75 with SMTP id zy11mr2421784vdc.22.1390805317381; Sun, 26 Jan 2014 22:48:37 -0800 (PST) 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.220.174.196 with SMTP id u4csp108331vcz; Sun, 26 Jan 2014 22:48:37 -0800 (PST) X-Received: by 10.66.233.71 with SMTP id tu7mr28588385pac.22.1390805316244; Sun, 26 Jan 2014 22:48:36 -0800 (PST) Received: from mail-pd0-f171.google.com (mail-pd0-f171.google.com [209.85.192.171]) by mx.google.com with ESMTPS id m8si10136863pbq.149.2014.01.26.22.48.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 26 Jan 2014 22:48:36 -0800 (PST) Received-SPF: neutral (google.com: 209.85.192.171 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.192.171; Received: by mail-pd0-f171.google.com with SMTP id g10so5365316pdj.30 for ; Sun, 26 Jan 2014 22:48:35 -0800 (PST) X-Received: by 10.67.5.7 with SMTP id ci7mr28447044pad.99.1390805315826; Sun, 26 Jan 2014 22:48:35 -0800 (PST) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id zc5sm28578637pbc.41.2014.01.26.22.48.33 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 26 Jan 2014 22:48:35 -0800 (PST) From: Sachin Kamat To: netdev@vger.kernel.org Cc: davem@davemloft.net, sachin.kamat@linaro.org, patches@linaro.org Subject: [PATCH 1/1] net: ipv4: Use PTR_ERR_OR_ZERO Date: Mon, 27 Jan 2014 12:13:57 +0530 Message-Id: <1390805037-20540-1-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: sachin.kamat@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.51 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: , PTR_RET is deprecated. Use PTR_ERR_OR_ZERO instead. While at it also include missing err.h header. Signed-off-by: Sachin Kamat --- net/ipv4/ip_tunnel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index c0e3cb72ad70..bd28f386bd02 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include @@ -930,7 +931,7 @@ int ip_tunnel_init_net(struct net *net, int ip_tnl_net_id, } rtnl_unlock(); - return PTR_RET(itn->fb_tunnel_dev); + return PTR_ERR_OR_ZERO(itn->fb_tunnel_dev); } EXPORT_SYMBOL_GPL(ip_tunnel_init_net);