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=-8.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT 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 13AA8C43381 for ; Fri, 1 Mar 2019 13:48:29 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D736020838 for ; Fri, 1 Mar 2019 13:48:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="S578paMK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D736020838 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=M4sKo33Vx2k1N3JPyo7aQ8C5X06F2IW7evshMJacqag=; b=S578paMKR4cZA+ FNHhhtsUBhMVq6k7R6f7LwiV8BHt1hDQS5b33Dovx5D5VzLyrgKRVwwN7ywVKVOwzPeojt+44QilW kVLrPBWLxhtszuPhNZVJ2eoTZOgeDLZgs1YsClLnsG5yiYW/qjN02gWQl0uwBFSeEHhl3Rd9wKJte Z8WMjFpxn1GcNbD9lDzqqpqJ7AbLptzNvc14pXLnqOPDS+Yyxo+2MyneFQDZbRCkgRepWFMWjiL97 BJqiIhKVmZ09Wtnq2nh7YkaDANEwYmmOVRiwa4AcVtljvowaJGR9/7yH97fKrO3bzKk+11KLTJWyq /pgKpbis/NDkfzhKD7kw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gziWZ-0000dw-BH; Fri, 01 Mar 2019 13:48:27 +0000 Received: from foss.arm.com ([217.140.101.70]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gziWW-0000da-3E for linux-arm-kernel@lists.infradead.org; Fri, 01 Mar 2019 13:48:25 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A5FE4A78; Fri, 1 Mar 2019 05:48:23 -0800 (PST) Received: from lakrids.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id DD6AD3F5C1; Fri, 1 Mar 2019 05:48:22 -0800 (PST) Date: Fri, 1 Mar 2019 13:48:20 +0000 From: Mark Rutland To: Will Deacon Subject: Re: [PATCH 03/10] arm64: debug: Remove unused return value from do_debug_exception() Message-ID: <20190301134820.GD15517@lakrids.cambridge.arm.com> References: <20190301132809.24653-1-will.deacon@arm.com> <20190301132809.24653-4-will.deacon@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190301132809.24653-4-will.deacon@arm.com> User-Agent: Mutt/1.11.1+11 (2f07cb52) (2018-12-01) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190301_054824_144533_B99E2331 X-CRM114-Status: GOOD ( 16.28 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: catalin.marinas@arm.com, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Mar 01, 2019 at 01:28:02PM +0000, Will Deacon wrote: > do_debug_exception() goes out of its way to return a value that isn't > ever used, so just make the thing void. > > Signed-off-by: Will Deacon Reviewed-by: Mark Rutland Mark. > --- > arch/arm64/mm/fault.c | 14 ++++---------- > 1 file changed, 4 insertions(+), 10 deletions(-) > > diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c > index ef46925096f0..f684f92d517c 100644 > --- a/arch/arm64/mm/fault.c > +++ b/arch/arm64/mm/fault.c > @@ -824,13 +824,12 @@ void __init hook_debug_fault_code(int nr, > debug_fault_info[nr].name = name; > } > > -asmlinkage int __exception do_debug_exception(unsigned long addr_if_watchpoint, > - unsigned int esr, > - struct pt_regs *regs) > +asmlinkage void __exception do_debug_exception(unsigned long addr_if_watchpoint, > + unsigned int esr, > + struct pt_regs *regs) > { > const struct fault_info *inf = esr_to_debug_fault_info(esr); > unsigned long pc = instruction_pointer(regs); > - int rv; > > /* > * Tell lockdep we disabled irqs in entry.S. Do nothing if they were > @@ -842,17 +841,12 @@ asmlinkage int __exception do_debug_exception(unsigned long addr_if_watchpoint, > if (user_mode(regs) && !is_ttbr0_addr(pc)) > arm64_apply_bp_hardening(); > > - if (!inf->fn(addr_if_watchpoint, esr, regs)) { > - rv = 1; > - } else { > + if (inf->fn(addr_if_watchpoint, esr, regs)) { > arm64_notify_die(inf->name, regs, > inf->sig, inf->code, (void __user *)pc, esr); > - rv = 0; > } > > if (interrupts_enabled(regs)) > trace_hardirqs_on(); > - > - return rv; > } > NOKPROBE_SYMBOL(do_debug_exception); > -- > 2.11.0 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel