From patchwork Sat Jul 31 15:05:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Krzysztof Halasa X-Patchwork-Id: 60422 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 DDF7E1007D1 for ; Sun, 1 Aug 2010 01:07:19 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756685Ab0GaPGx (ORCPT ); Sat, 31 Jul 2010 11:06:53 -0400 Received: from khc.piap.pl ([195.187.100.11]:45825 "EHLO khc.piap.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756590Ab0GaPGY (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 5FA8299A8; Sat, 31 Jul 2010 17:05:54 +0200 (CEST) From: Krzysztof Halasa To: David Miller Cc: Subject: [PATCH 19/29] LMC: Remove sc->check. We don't do such checks in drivers. Date: Sat, 31 Jul 2010 17:05:42 +0200 Message-Id: <1280588752-9340-19-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/main.c | 9 --------- drivers/net/wan/lmc/var.h | 2 -- 2 files changed, 0 insertions(+), 11 deletions(-) diff --git a/drivers/net/wan/lmc/main.c b/drivers/net/wan/lmc/main.c index 6698aa9..56631d4 100644 --- a/drivers/net/wan/lmc/main.c +++ b/drivers/net/wan/lmc/main.c @@ -575,14 +575,6 @@ static void lmc_watchdog(unsigned long data) spin_lock_irqsave(&sc->lock, flags); - if (sc->check != 0xBEAFCAFE) { - printk(KERN_ERR - "LMC: Corrupt net_device struct, breaking out\n"); - spin_unlock_irqrestore(&sc->lock, flags); - return; - } - - /* Make sure the tx jabber and rx watchdog are off, * and the transmit and receive processes are running. */ @@ -761,7 +753,6 @@ static int __devinit lmc_init_one(struct pci_dev *pdev, dev->tx_queue_len = 100; sc->netdev = dev; sc->name = dev->name; - sc->check = 0xBEAFCAFE; dev->base_addr = pci_resource_start(pdev, 0); dev->irq = pdev->irq; pci_set_drvdata(pdev, dev); diff --git a/drivers/net/wan/lmc/var.h b/drivers/net/wan/lmc/var.h index a3e9aee..10cb70d 100644 --- a/drivers/net/wan/lmc/var.h +++ b/drivers/net/wan/lmc/var.h @@ -320,8 +320,6 @@ struct card { u8 failed_ring; /* Failure cases */ u8 failed_recv_alloc; - - u32 check; /* Structure check */ }; #define PKT_BUF_SZ 1542