Commit 94d0fe11 authored by Michael Hayes's avatar Michael Hayes Committed by David Woodhouse

[PATCH] Spelling fixes - transceiver

This fixes:
    tranceiver -> transceiver

Some function names had this misspelling (e.g. e100_reset_tranceiver)
and I changed them, but I haven't tested it.

Fixes 34 occurrences in all.
parent 1412867b
......@@ -236,7 +236,7 @@ static unsigned int network_rec_config_shadow = 0;
/* Network speed indication. */
static struct timer_list speed_timer = TIMER_INITIALIZER(NULL, 0, 0);
static struct timer_list clear_led_timer = TIMER_INITIALIZER(NULL, 0, 0);
static int current_speed; /* Speed read from tranceiver */
static int current_speed; /* Speed read from transceiver */
static int current_speed_selection; /* Speed selected by user */
static int led_next_time;
static int led_active;
......@@ -276,7 +276,7 @@ static unsigned short e100_get_mdio_reg(unsigned char reg_num);
static void e100_send_mdio_cmd(unsigned short cmd, int write_cmd);
static void e100_send_mdio_bit(unsigned char bit);
static unsigned char e100_receive_mdio_bit(void);
static void e100_reset_tranceiver(void);
static void e100_reset_transceiver(void);
static void e100_clear_network_leds(unsigned long dummy);
static void e100_set_network_leds(int active);
......@@ -786,7 +786,7 @@ e100_receive_mdio_bit()
}
static void
e100_reset_tranceiver(void)
e100_reset_transceiver(void)
{
unsigned short cmd;
unsigned short data;
......@@ -826,9 +826,9 @@ e100_tx_timeout(struct net_device *dev)
RESET_DMA(NETWORK_TX_DMA_NBR);
WAIT_DMA(NETWORK_TX_DMA_NBR);
/* Reset the tranceiver. */
/* Reset the transceiver. */
e100_reset_tranceiver();
e100_reset_transceiver();
/* and get rid of the packet that never got an interrupt */
......
......@@ -129,7 +129,7 @@ static void set_multicast_list(struct net_device *dev);
static void e100_hardware_send_packet(unsigned long hostcmd, char *buf, int length);
static void update_rx_stats(struct net_device_stats *);
static void update_tx_stats(struct net_device_stats *);
static void e100_reset_tranceiver(void);
static void e100_reset_transceiver(void);
static void boot_slave(unsigned char *code);
......@@ -528,7 +528,7 @@ e100_open(struct net_device *dev)
}
static void
e100_reset_tranceiver(void)
e100_reset_transceiver(void)
{
/* To do: Reboot and setup slave Etrax */
}
......@@ -554,9 +554,9 @@ e100_tx_timeout(struct net_device *dev)
RESET_DMA(4);
WAIT_DMA(4);
/* Reset the tranceiver. */
/* Reset the transceiver. */
e100_reset_tranceiver();
e100_reset_transceiver();
/* and get rid of the packet that never got an interrupt */
......
......@@ -2802,7 +2802,7 @@ send_break(struct e100_serial * info, int duration)
info->tx_ctrl |= (0x80 | 0x40); /* Set bit 7 (txd) and 6 (tr_enable) */
info->port[REG_TR_CTRL] = info->tx_ctrl;
/* the DMA gets awfully confused if we toggle the tranceiver like this
/* the DMA gets awfully confused if we toggle the transceiver like this
* so we need to reset it
*/
*info->ocmdadr = 4;
......
......@@ -693,7 +693,7 @@ MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_EL2_CARDS) "i");
MODULE_PARM(xcvr, "1-" __MODULE_STRING(MAX_EL2_CARDS) "i");
MODULE_PARM_DESC(io, "I/O base address(es)");
MODULE_PARM_DESC(irq, "IRQ number(s) (assigned)");
MODULE_PARM_DESC(xcvr, "tranceiver(s) (0=internal, 1=external)");
MODULE_PARM_DESC(xcvr, "transceiver(s) (0=internal, 1=external)");
MODULE_DESCRIPTION("3Com ISA EtherLink II, II/16 (3c503, 3c503/16) driver");
MODULE_LICENSE("GPL");
......
......@@ -1139,7 +1139,7 @@ el3_netdev_get_ecmd(struct net_device *dev, struct ethtool_cmd *ecmd)
int ioaddr = dev->base_addr;
EL3WINDOW(0);
/* obtain current tranceiver via WN4_MEDIA? */
/* obtain current transceiver via WN4_MEDIA? */
tmp = inw(ioaddr + WN0_ADDR_CONF);
ecmd->transceiver = XCVR_INTERNAL;
switch (tmp >> 14) {
......@@ -1548,7 +1548,7 @@ MODULE_PARM(xcvr,"1-12i");
MODULE_PARM(max_interrupt_work, "i");
MODULE_PARM_DESC(debug, "debug level (0-6)");
MODULE_PARM_DESC(irq, "IRQ number(s) (assigned)");
MODULE_PARM_DESC(xcvr,"tranceiver(s) (0=internal, 1=external)");
MODULE_PARM_DESC(xcvr,"transceiver(s) (0=internal, 1=external)");
MODULE_PARM_DESC(max_interrupt_work, "maximum events handled per interrupt");
#ifdef __ISAPNP__
MODULE_PARM(nopnp, "i");
......
......@@ -162,7 +162,7 @@ MODULE_PARM_DESC(max_interrupt_work, "ATP maximum events handled per interrupt")
MODULE_PARM_DESC(debug, "ATP debug level (0-7)");
MODULE_PARM_DESC(io, "ATP I/O base address(es)");
MODULE_PARM_DESC(irq, "ATP IRQ number(s)");
MODULE_PARM_DESC(xcvr, "ATP tranceiver(s) (0=internal, 1=external)");
MODULE_PARM_DESC(xcvr, "ATP transceiver(s) (0=internal, 1=external)");
/* The number of low I/O ports used by the ethercard. */
#define ETHERCARD_TOTAL_SIZE 3
......
......@@ -389,7 +389,7 @@ MODULE_PARM(xcvr, "1-" __MODULE_STRING(MAX_E21_CARDS) "i");
MODULE_PARM_DESC(io, "I/O base address(es)");
MODULE_PARM_DESC(irq, "IRQ number(s)");
MODULE_PARM_DESC(mem, " memory base address(es)");
MODULE_PARM_DESC(xcvr, "tranceiver(s) (0=internal, 1=external)");
MODULE_PARM_DESC(xcvr, "transceiver(s) (0=internal, 1=external)");
MODULE_DESCRIPTION("Cabletron E2100 ISA ethernet driver");
MODULE_LICENSE("GPL");
......
......@@ -148,7 +148,7 @@ MODULE_PARM(rx_copybreak, "i");
MODULE_PARM(max_interrupt_work, "i");
MODULE_PARM(multicast_filter_limit, "i");
MODULE_PARM_DESC(debug, "debug level (0-6)");
MODULE_PARM_DESC(options, "Bits 0-3: tranceiver type, bit 4: full duplex, bit 5: 100Mbps");
MODULE_PARM_DESC(options, "Bits 0-3: transceiver type, bit 4: full duplex, bit 5: 100Mbps");
MODULE_PARM_DESC(full_duplex, "full duplex setting(s) (1)");
MODULE_PARM_DESC(congenb, "Enable congestion control (1)");
MODULE_PARM_DESC(txfifo, "Tx FIFO threshold in 4 byte units, (0-15)");
......
......@@ -2399,7 +2399,7 @@ void TLan_SetMac( struct net_device *dev, int areg, char *mac )
* dev A pointer to the device structure of the
* TLAN device having the PHYs to be detailed.
*
* This function prints the registers a PHY (aka tranceiver).
* This function prints the registers a PHY (aka transceiver).
*
********************************************************************/
......@@ -2515,7 +2515,7 @@ void TLan_PhyPowerDown( struct net_device *dev )
/* Wait for 50 ms and powerup
* This is abitrary. It is intended to make sure the
* tranceiver settles.
* transceiver settles.
*/
TLan_SetTimer( dev, (HZ/20), TLAN_TIMER_PHY_PUP );
......@@ -2535,7 +2535,7 @@ void TLan_PhyPowerUp( struct net_device *dev )
TLan_MiiWriteReg( dev, priv->phy[priv->phyNum], MII_GEN_CTL, value );
TLan_MiiSync(dev->base_addr);
/* Wait for 500 ms and reset the
* tranceiver. The TLAN docs say both 50 ms and
* transceiver. The TLAN docs say both 50 ms and
* 500 ms, so do the longer, just in case.
*/
TLan_SetTimer( dev, (HZ/20), TLAN_TIMER_PHY_RESET );
......@@ -2650,7 +2650,7 @@ void TLan_PhyStartLink( struct net_device *dev )
TLan_MiiWriteReg( dev, phy, TLAN_TLPHY_CTL, tctl );
}
/* Wait for 2 sec to give the tranceiver time
/* Wait for 2 sec to give the transceiver time
* to establish link.
*/
TLan_SetTimer( dev, (4*HZ), TLAN_TIMER_FINISH_RESET );
......
......@@ -597,7 +597,7 @@ static int eeprom_read(long addr, int location)
#define mdio_delay(mdio_addr) readl(mdio_addr)
/* Set iff a MII transceiver on any interface requires mdio preamble.
This only set with older tranceivers, so the extra
This only set with older transceivers, so the extra
code size of a per-interface flag is not worthwhile. */
static char mii_preamble_required = 1;
......
......@@ -121,7 +121,7 @@ static struct net_device_stats *xircom_get_stats(struct net_device *dev);
static void investigate_read_descriptor(struct net_device *dev,struct xircom_private *card, int descnr, unsigned int bufferoffset);
static void investigate_write_descriptor(struct net_device *dev, struct xircom_private *card, int descnr, unsigned int bufferoffset);
static void read_mac_address(struct xircom_private *card);
static void tranceiver_voodoo(struct xircom_private *card);
static void transceiver_voodoo(struct xircom_private *card);
static void initialize_card(struct xircom_private *card);
static void trigger_transmit(struct xircom_private *card);
static void trigger_receive(struct xircom_private *card);
......@@ -301,7 +301,7 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_
/* start the transmitter to get a heartbeat */
/* TODO: send 2 dummy packets here */
tranceiver_voodoo(private);
transceiver_voodoo(private);
spin_lock_irqsave(&private->lock,flags);
activate_transmitter(private);
......@@ -1116,15 +1116,15 @@ static void read_mac_address(struct xircom_private *card)
/*
tranceiver_voodoo() enables the external UTP plug thingy.
transceiver_voodoo() enables the external UTP plug thingy.
it's called voodoo as I stole this code and cannot cross-reference
it with the specification.
*/
static void tranceiver_voodoo(struct xircom_private *card)
static void transceiver_voodoo(struct xircom_private *card)
{
unsigned long flags;
enter("tranceiver_voodoo");
enter("transceiver_voodoo");
/* disable all powermanagement */
pci_write_config_dword(card->pdev, PCI_POWERMGMT, 0x0000);
......@@ -1143,7 +1143,7 @@ static void tranceiver_voodoo(struct xircom_private *card)
spin_unlock_irqrestore(&card->lock, flags);
netif_start_queue(card->dev);
leave("tranceiver_voodoo");
leave("transceiver_voodoo");
}
......
......@@ -486,7 +486,7 @@ static void find_mii_transceivers(struct net_device *dev)
/*
* To quote Arjan van de Ven:
* tranceiver_voodoo() enables the external UTP plug thingy.
* transceiver_voodoo() enables the external UTP plug thingy.
* it's called voodoo as I stole this code and cannot cross-reference
* it with the specification.
* Actually it seems to go like this:
......
......@@ -79,7 +79,7 @@ static const char *arlan_diagnostic_info_string(struct net_device *dev)
case 0xFB:
return "ERROR BackBone failure ";
case 0xFA:
return "ERROR tranceiver not found ";
return "ERROR transceiver not found ";
case 0xF9:
return "ERROR no more address space ";
case 0xF8:
......
......@@ -6016,7 +6016,7 @@ ahd_chip_init(struct ahd_softc *ahd)
* Now that termination is set, wait for up
* to 500ms for our transceivers to settle. If
* the adapter does not have a cable attached,
* the tranceivers may never settle, so don't
* the transceivers may never settle, so don't
* complain if we fail here.
*/
for (wait = 10000;
......
......@@ -4999,7 +4999,7 @@ ahc_init(struct ahc_softc *ahc)
/*
* Wait for up to 500ms for our transceivers
* to settle. If the adapter does not have
* a cable attached, the tranceivers may
* a cable attached, the transceivers may
* never settle, so don't complain if we
* fail here.
*/
......
......@@ -244,7 +244,7 @@
* But for HVD/SE only capable chips (825a, 875, 885),
* the driver uses some heuristic to probe against HVD.
* Normally, the chip senses the DIFFSENS signal and
* should switch its BUS tranceivers to high impedance
* should switch its BUS transceivers to high impedance
* in situation of the driver having been wrong about
* the actual BUS mode. May-be, the BUS mode probing of
* the driver is safe, but, given that it may be partially
......
......@@ -22,7 +22,7 @@ struct ethtool_cmd {
u8 duplex; /* Duplex, half or full */
u8 port; /* Which connector port */
u8 phy_address;
u8 transceiver; /* Which tranceiver to use */
u8 transceiver; /* Which transceiver to use */
u8 autoneg; /* Enable or disable autonegotiation */
u32 maxtxpkt; /* Tx pkts before generating tx int */
u32 maxrxpkt; /* Rx pkts before generating rx int */
......@@ -336,7 +336,7 @@ struct ethtool_stats {
#define PORT_FIBRE 0x03
#define PORT_BNC 0x04
/* Which tranceiver to use. */
/* Which transceiver to use. */
#define XCVR_INTERNAL 0x00
#define XCVR_EXTERNAL 0x01
#define XCVR_DUMMY1 0x02
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment