From patchwork Tue May 7 03:57:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 241924 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 73C062C014C for ; Tue, 7 May 2013 14:04:18 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933423Ab3EGED6 (ORCPT ); Tue, 7 May 2013 00:03:58 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.122]:8035 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760341Ab3EGD6y (ORCPT ); Mon, 6 May 2013 23:58:54 -0400 X-Authority-Analysis: v=2.0 cv=GtrACzJC c=1 sm=0 a=rXTBtCOcEpjy1lPqhTCpEQ==:17 a=mNMOxpOpBa8A:10 a=Ciwy3NGCPMMA:10 a=AB216oD2IGAA:10 a=5SG0PmZfjMsA:10 a=bbbx4UPp9XUA:10 a=meVymXHHAAAA:8 a=_WC_M6a3ZY4A:10 a=DfNHnWVPAAAA:8 a=danhDmx_AAAA:8 a=pGLkceISAAAA:8 a=mK_AVkanAAAA:8 a=vmLDa1wCAAAA:8 a=VwQbUJbxAAAA:8 a=cq5IILDZAAAA:8 a=fC4T7qsy4_4xvlMS5R0A:9 a=lBRciGGoxdUA:10 a=MSl-tDqOz04A:10 a=9xyTavCNlvEA:10 a=gv_BBZfBKR8A:10 a=jeBq3FmKZ4MA:10 a=rXTBtCOcEpjy1lPqhTCpEQ==:117 X-Cloudmark-Score: 0 X-Authenticated-User: X-Originating-IP: 74.67.115.198 Received: from [74.67.115.198] ([74.67.115.198:51878] helo=gandalf.local.home) by hrndva-oedge02.mail.rr.com (envelope-from ) (ecelerity 2.2.3.46 r()) with ESMTP id 45/34-22134-8FB78815; Tue, 07 May 2013 03:58:48 +0000 Received: from rostedt by gandalf.local.home with local (Exim 4.80) (envelope-from ) id 1UZZ39-0001gM-SN; Mon, 06 May 2013 23:58:47 -0400 Message-Id: <20130507035847.818086055@goodmis.org> User-Agent: quilt/0.60-1 Date: Mon, 06 May 2013 23:57:53 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ivo van Doorn , Gertjan van Wingerde , Helmut Schaa , "John W. Linville" , , , , Tim Gardner Subject: [041/126] rt2x00: rt2x00pci_regbusy_read() - only print register access failure once References: <20130507035712.909872333@goodmis.org> Content-Disposition: inline; filename=0041-rt2x00-rt2x00pci_regbusy_read-only-print-register-ac.patch Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 3.6.11.3 stable review patch. If anyone has any objections, please let me know. ------------------ From: Tim Gardner [ Upstream commit 83589b30f1e1dc9898986293c9336b8ce1705dec ] BugLink: http://bugs.launchpad.net/bugs/1128840 It appears that when this register read fails it never recovers, so I think there is no need to repeat the same error message ad infinitum. Cc: Ivo van Doorn Cc: Gertjan van Wingerde Cc: Helmut Schaa Cc: "John W. Linville" Cc: linux-wireless@vger.kernel.org Cc: users@rt2x00.serialmonkey.com Cc: netdev@vger.kernel.org Cc: stable@vger.kernel.org Signed-off-by: Tim Gardner Signed-off-by: John W. Linville Signed-off-by: Steven Rostedt --- drivers/net/wireless/rt2x00/rt2x00pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c index a0c8cae..b1c673e 100644 --- a/drivers/net/wireless/rt2x00/rt2x00pci.c +++ b/drivers/net/wireless/rt2x00/rt2x00pci.c @@ -52,8 +52,8 @@ int rt2x00pci_regbusy_read(struct rt2x00_dev *rt2x00dev, udelay(REGISTER_BUSY_DELAY); } - ERROR(rt2x00dev, "Indirect register access failed: " - "offset=0x%.08x, value=0x%.08x\n", offset, *reg); + printk_once(KERN_ERR "%s() Indirect register access failed: " + "offset=0x%.08x, value=0x%.08x\n", __func__, offset, *reg); *reg = ~0; return 0;