From patchwork Sat Jul 31 15:05:33 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Krzysztof Halasa X-Patchwork-Id: 60431 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 730DE1007D1 for ; Sun, 1 Aug 2010 01:07:46 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756745Ab0GaPHl (ORCPT ); Sat, 31 Jul 2010 11:07:41 -0400 Received: from khc.piap.pl ([195.187.100.11]:57508 "EHLO khc.piap.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756507Ab0GaPGO (ORCPT ); Sat, 31 Jul 2010 11:06:14 -0400 Received: from intrepid.localdomain (intrepid.localdomain [10.0.0.2]) by khc.piap.pl (Postfix) with ESMTP id C362C98B4; Sat, 31 Jul 2010 17:05:53 +0200 (CEST) From: Krzysztof Halasa To: David Miller Cc: Subject: [PATCH 10/29] LMC: Remove empty media functions. Date: Sat, 31 Jul 2010 17:05:33 +0200 Message-Id: <1280588752-9340-10-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 | 3 ++- drivers/net/wan/lmc/media.c | 16 ---------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/drivers/net/wan/lmc/main.c b/drivers/net/wan/lmc/main.c index 6b7c09a..1fbd802 100644 --- a/drivers/net/wan/lmc/main.c +++ b/drivers/net/wan/lmc/main.c @@ -692,7 +692,8 @@ static void lmc_watchdog(unsigned long data) } /* Call media specific watchdog functions */ - sc->lmc_media->watchdog(sc); + if (sc->lmc_media->watchdog) + sc->lmc_media->watchdog(sc); /* Poke the transmitter to make sure it never stops, even if we run out of mem */ diff --git a/drivers/net/wan/lmc/media.c b/drivers/net/wan/lmc/media.c index 9701d30..2411214 100644 --- a/drivers/net/wan/lmc/media.c +++ b/drivers/net/wan/lmc/media.c @@ -428,11 +428,6 @@ static void lmc_hssi_set_crc_length(struct card * const sc, int state) lmc_mii_writereg(sc, 0, 16, sc->lmc_miireg16); } -static void lmc_hssi_watchdog(struct card * const sc) -{ - /* HSSI is blank */ -} - static void lmc_hssi_default(struct card * const sc) { sc->lmc_miireg16 = LMC_MII16_LED_ALL; @@ -630,10 +625,6 @@ static void lmc_ds3_set_crc_length(struct card * const sc, int state) lmc_mii_writereg(sc, 0, 16, sc->lmc_miireg16); } -static void lmc_ds3_watchdog(struct card * const sc) -{ -} - static void lmc_ds3_default(struct card * const sc) { sc->lmc_miireg16 = LMC_MII16_LED_ALL; @@ -907,10 +898,6 @@ static void lmc_t1_set_clock(struct card * const sc, int ie) } } -static void lmc_t1_watchdog(struct card * const sc) -{ -} - static void lmc_t1_default(struct card * const sc) { sc->lmc_miireg16 = LMC_MII16_LED_ALL; @@ -941,7 +928,6 @@ struct media lmc_hssi_media = { .get_link_status = lmc_hssi_get_link_status, .set_link_status = lmc_hssi_set_link_status, .set_crc_length = lmc_hssi_set_crc_length, - .watchdog = lmc_hssi_watchdog, }; struct media lmc_ds3_media = { @@ -952,7 +938,6 @@ struct media lmc_ds3_media = { .set_scrambler = lmc_ds3_set_scram, .get_link_status = lmc_ds3_get_link_status, .set_crc_length = lmc_ds3_set_crc_length, - .watchdog = lmc_ds3_watchdog, }; struct media lmc_t1_media = { @@ -963,5 +948,4 @@ struct media lmc_t1_media = { .get_link_status = lmc_t1_get_link_status, .set_crc_length = lmc_t1_set_crc_length, .set_circuit_type = lmc_t1_set_circuit_type, - .watchdog = lmc_t1_watchdog, };