From patchwork Sat Jul 31 15:05:40 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Krzysztof Halasa X-Patchwork-Id: 60425 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 9079D1007D1 for ; Sun, 1 Aug 2010 01:07:30 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756698Ab0GaPHK (ORCPT ); Sat, 31 Jul 2010 11:07:10 -0400 Received: from khc.piap.pl ([195.187.100.11]:45257 "EHLO khc.piap.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756573Ab0GaPGY (ORCPT ); Sat, 31 Jul 2010 11:06:24 -0400 Received: from intrepid.localdomain (intrepid.localdomain [10.0.0.2]) by khc.piap.pl (Postfix) with ESMTP id 2E3DE9979; Sat, 31 Jul 2010 17:05:54 +0200 (CEST) From: Krzysztof Halasa To: David Miller Cc: Subject: [PATCH 17/29] LMC: don't wait in lmc_trace(). Date: Sat, 31 Jul 2010 17:05:40 +0200 Message-Id: <1280588752-9340-17-git-send-email-khc@pm.waw.pl> X-Mailer: git-send-email 1.7.1.1 In-Reply-To: References: MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Krzysztof Hałasa Signed-off-by: Krzysztof Hałasa --- drivers/net/wan/lmc/var.h | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/drivers/net/wan/lmc/var.h b/drivers/net/wan/lmc/var.h index f5b233c..38f61cb 100644 --- a/drivers/net/wan/lmc/var.h +++ b/drivers/net/wan/lmc/var.h @@ -434,19 +434,10 @@ extern struct media lmc_hssi_media; static inline void lmc_trace(struct net_device *dev, char *msg) { #ifdef LMC_TRACE - unsigned long j = jiffies + 3; /* Wait for 50 ms */ - - if (in_interrupt()) { + if (in_interrupt()) printk(KERN_DEBUG "%s: * %s\n", dev->name, msg); -#if 0 - while (time_before(jiffies, j + 10)) - ; -#endif - } else { + else printk(KERN_DEBUG "%s: %s\n", dev->name, msg); - while (time_before(jiffies, j)) - schedule(); - } #endif }