@@ -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 */
@@ -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,
};