From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6707BC468C6 for ; Thu, 19 Jul 2018 14:41:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 27EAF20856 for ; Thu, 19 Jul 2018 14:41:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 27EAF20856 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=de.ibm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731890AbeGSPYo (ORCPT ); Thu, 19 Jul 2018 11:24:44 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:38300 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731847AbeGSPYo (ORCPT ); Thu, 19 Jul 2018 11:24:44 -0400 Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w6JEd5NO039812 for ; Thu, 19 Jul 2018 10:41:15 -0400 Received: from e06smtp03.uk.ibm.com (e06smtp03.uk.ibm.com [195.75.94.99]) by mx0a-001b2d01.pphosted.com with ESMTP id 2kavat90cq-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 19 Jul 2018 10:41:14 -0400 Received: from localhost by e06smtp03.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 19 Jul 2018 15:41:12 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp03.uk.ibm.com (192.168.101.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Thu, 19 Jul 2018 15:41:09 +0100 Received: from d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w6JEf8ld39387374 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 19 Jul 2018 14:41:08 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 821FD11C04A; Thu, 19 Jul 2018 17:41:25 +0100 (BST) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4969311C052; Thu, 19 Jul 2018 17:41:25 +0100 (BST) Received: from mschwideX1 (unknown [9.152.212.148]) by d06av25.portsmouth.uk.ibm.com (Postfix) with ESMTP; Thu, 19 Jul 2018 17:41:25 +0100 (BST) Date: Thu, 19 Jul 2018 16:41:07 +0200 From: Martin Schwidefsky To: "Gustavo A. R. Silva" Cc: Heiko Carstens , linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] s390/hypfs: Replace PTR_RET with PTR_ERR_OR_ZERO In-Reply-To: <20180719050830.GA26688@embeddedor.com> References: <20180719050830.GA26688@embeddedor.com> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-TM-AS-GCONF: 00 x-cbid: 18071914-0012-0000-0000-0000028C2C7E X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18071914-0013-0000-0000-000020BDF630 Message-Id: <20180719164107.3c2a2385@mschwideX1> Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-07-19_06:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1806210000 definitions=main-1807190157 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 19 Jul 2018 00:08:30 -0500 "Gustavo A. R. Silva" wrote: > PTR_RET is deprecated, use PTR_ERR_OR_ZERO instead. > > Signed-off-by: Gustavo A. R. Silva > --- > arch/s390/hypfs/hypfs_diag.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/s390/hypfs/hypfs_diag.c b/arch/s390/hypfs/hypfs_diag.c > index a2945b2..3452e18 100644 > --- a/arch/s390/hypfs/hypfs_diag.c > +++ b/arch/s390/hypfs/hypfs_diag.c > @@ -497,7 +497,7 @@ static int hypfs_create_cpu_files(struct dentry *cpus_dir, void *cpu_info) > } > diag224_idx2name(cpu_info__ctidx(diag204_info_type, cpu_info), buffer); > rc = hypfs_create_str(cpu_dir, "type", buffer); > - return PTR_RET(rc); > + return PTR_ERR_OR_ZERO(rc); > } > > static void *hypfs_create_lpar_files(struct dentry *systems_dir, void *part_hdr) > @@ -544,7 +544,7 @@ static int hypfs_create_phys_cpu_files(struct dentry *cpus_dir, void *cpu_info) > return PTR_ERR(rc); > diag224_idx2name(phys_cpu__ctidx(diag204_info_type, cpu_info), buffer); > rc = hypfs_create_str(cpu_dir, "type", buffer); > - return PTR_RET(rc); > + return PTR_ERR_OR_ZERO(rc); > } > > static void *hypfs_create_phys_files(struct dentry *parent_dir, void *phys_hdr) Applied to the s390/linux tree for the next merge window. Thanks. -- blue skies, Martin. "Reality continues to ruin my life." - Calvin.