diff options
author | Alan Cox <alan@linux.intel.com> | 2009-06-10 17:30:41 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:01:26 -0700 |
commit | 64f930361bede4e049509858bcef8b333399547f (patch) | |
tree | 6d32e7f5ca0fd9c6178afc06c793a54c3ba20656 /drivers/staging/et131x/et131x_netdev.c | |
parent | 297f06cea635ea4552541a11e7fb7014425110c6 (diff) |
Staging: et1310: Fix the coding style
UTF-8 for copyright symbols etc included. Typedefs and anything else which
would cause actual code changes skipped.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/et131x/et131x_netdev.c')
-rw-r--r-- | drivers/staging/et131x/et131x_netdev.c | 123 |
1 files changed, 62 insertions, 61 deletions
diff --git a/drivers/staging/et131x/et131x_netdev.c b/drivers/staging/et131x/et131x_netdev.c index 59e99cc7786..74a8375f947 100644 --- a/drivers/staging/et131x/et131x_netdev.c +++ b/drivers/staging/et131x/et131x_netdev.c @@ -2,7 +2,7 @@ * Agere Systems Inc. * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs * - * Copyright © 2005 Agere Systems Inc. + * Copyright © 2005 Agere Systems Inc. * All rights reserved. * http://www.agere.com * @@ -19,7 +19,7 @@ * software indicates your acceptance of these terms and conditions. If you do * not agree with these terms and conditions, do not use the software. * - * Copyright © 2005 Agere Systems Inc. + * Copyright © 2005 Agere Systems Inc. * All rights reserved. * * Redistribution and use in source or binary forms, with or without @@ -40,7 +40,7 @@ * * Disclaimer * - * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, + * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN @@ -73,9 +73,9 @@ #include <linux/interrupt.h> #include <linux/in.h> #include <linux/delay.h> -#include <asm/io.h> +#include <linux/io.h> +#include <linux/bitops.h> #include <asm/system.h> -#include <asm/bitops.h> #include <linux/mii.h> #include <linux/netdevice.h> @@ -153,16 +153,16 @@ struct net_device *et131x_device_alloc(void) /* Setup the function registration table (and other data) for a * net_device */ - //netdev->init = &et131x_init; - //netdev->set_config = &et131x_config; + /* netdev->init = &et131x_init; */ + /* netdev->set_config = &et131x_config; */ netdev->watchdog_timeo = ET131X_TX_TIMEOUT; netdev->netdev_ops = &et131x_netdev_ops; - //netdev->ethtool_ops = &et131x_ethtool_ops; + /* netdev->ethtool_ops = &et131x_ethtool_ops; */ - // Poll? - //netdev->poll = &et131x_poll; - //netdev->poll_controller = &et131x_poll_controller; + /* Poll? */ + /* netdev->poll = &et131x_poll; */ + /* netdev->poll_controller = &et131x_poll_controller; */ DBG_LEAVE(et131x_dbginfo); return netdev; @@ -194,23 +194,25 @@ struct net_device_stats *et131x_stats(struct net_device *netdev) stats->rx_over_errors = devstat->rx_ov_flow; stats->rx_crc_errors = devstat->crc_err; - // NOTE: These stats don't have corresponding values in CE_STATS, so we're - // going to have to update these directly from within the TX/RX code - //stats->rx_bytes = 20; //devstat->; - //stats->tx_bytes = 20; //devstat->; - //stats->rx_dropped = devstat->; - //stats->tx_dropped = devstat->; - - // NOTE: Not used, can't find analogous statistics - //stats->rx_frame_errors = devstat->; - //stats->rx_fifo_errors = devstat->; - //stats->rx_missed_errors = devstat->; - - //stats->tx_aborted_errors = devstat->; - //stats->tx_carrier_errors = devstat->; - //stats->tx_fifo_errors = devstat->; - //stats->tx_heartbeat_errors = devstat->; - //stats->tx_window_errors = devstat->; + /* NOTE: These stats don't have corresponding values in CE_STATS, + * so we're going to have to update these directly from within the + * TX/RX code + */ + /* stats->rx_bytes = 20; devstat->; */ + /* stats->tx_bytes = 20; devstat->; */ + /* stats->rx_dropped = devstat->; */ + /* stats->tx_dropped = devstat->; */ + + /* NOTE: Not used, can't find analogous statistics */ + /* stats->rx_frame_errors = devstat->; */ + /* stats->rx_fifo_errors = devstat->; */ + /* stats->rx_missed_errors = devstat->; */ + + /* stats->tx_aborted_errors = devstat->; */ + /* stats->tx_carrier_errors = devstat->; */ + /* stats->tx_fifo_errors = devstat->; */ + /* stats->tx_heartbeat_errors = devstat->; */ + /* stats->tx_window_errors = devstat->; */ DBG_LEAVE(et131x_dbginfo); return stats; @@ -414,10 +416,11 @@ int et131x_set_packet_filter(struct et131x_adapter *adapter) */ if (filter & ET131X_PACKET_TYPE_ALL_MULTICAST) { DBG_VERBOSE(et131x_dbginfo, - "Multicast filtering OFF (Rx ALL MULTICAST)\n"); + "Multicast filtering OFF (Rx ALL MULTICAST)\n"); pf_ctrl.bits.filter_multi_en = 0; } else { - DBG_VERBOSE(et131x_dbginfo, "Multicast filtering ON\n"); + DBG_VERBOSE(et131x_dbginfo, + "Multicast filtering ON\n"); SetupDeviceForMulticast(adapter); pf_ctrl.bits.filter_multi_en = 1; ctrl.bits.pkt_filter_disable = 0; @@ -505,9 +508,7 @@ void et131x_multicast(struct net_device *netdev) if (netdev->mc_count > NIC_MAX_MCAST_LIST) { DBG_WARNING(et131x_dbginfo, - "ACCEPT ALL MULTICAST for now, as there's more Multicast " - "addresses than the HW supports\n"); - + "ACCEPT ALL MULTICAST for now, as there's more Multicast addresses than the HW supports\n"); adapter->PacketFilter |= ET131X_PACKET_TYPE_ALL_MULTICAST; } @@ -525,10 +526,10 @@ void et131x_multicast(struct net_device *netdev) adapter->MCAddressCount = netdev->mc_count; if (netdev->mc_count) { - if (mclist->dmi_addrlen != ETH_ALEN) { + if (mclist->dmi_addrlen != ETH_ALEN) DBG_WARNING(et131x_dbginfo, - "Multicast addrs are not ETH_ALEN in size\n"); - } else { + "Multicast addrs are not ETH_ALEN in size\n"); + else { count = netdev->mc_count - 1; memcpy(adapter->MCList[count], mclist->dmi_addr, ETH_ALEN); @@ -662,15 +663,15 @@ void et131x_tx_timeout(struct net_device *netdev) lockflags); DBG_WARNING(et131x_dbginfo, - "Send stuck - reset. pMpTcb->WrIndex %x, Flags 0x%08x\n", - pMpTcb->WrIndex.bits.val, - pMpTcb->Flags); + "Send stuck - reset. pMpTcb->WrIndex %x, Flags 0x%08x\n", + pMpTcb->WrIndex.bits.val, + pMpTcb->Flags); DBG_WARNING(et131x_dbginfo, - "pDesc 0x%08x, 0x%08x, 0x%08x, 0x%08x\n", - pDesc->DataBufferPtrHigh, - pDesc->DataBufferPtrLow, pDesc->word2.value, - pDesc->word3.value); + "pDesc 0x%08x, 0x%08x, 0x%08x, 0x%08x\n", + pDesc->DataBufferPtrHigh, + pDesc->DataBufferPtrLow, pDesc->word2.value, + pDesc->word3.value); DBG_WARNING(et131x_dbginfo, "WbStatus 0x%08x\n", txDmaComplete.value); @@ -737,7 +738,7 @@ int et131x_change_mtu(struct net_device *netdev, int new_mtu) result = et131x_adapter_memory_alloc(adapter); if (result != 0) { DBG_WARNING(et131x_dbginfo, - "Change MTU failed; couldn't re-alloc DMA memory\n"); + "Change MTU failed; couldn't re-alloc DMA memory\n"); return result; } @@ -750,9 +751,8 @@ int et131x_change_mtu(struct net_device *netdev, int new_mtu) et131x_adapter_setup(adapter); /* Enable interrupts */ - if (MP_TEST_FLAG(adapter, fMP_ADAPTER_INTERRUPT_IN_USE)) { + if (MP_TEST_FLAG(adapter, fMP_ADAPTER_INTERRUPT_IN_USE)) et131x_enable_interrupts(adapter); - } /* Restart the Tx and Rx DMA engines */ et131x_rx_dma_enable(adapter); @@ -781,8 +781,8 @@ int et131x_set_mac_addr(struct net_device *netdev, void *new_mac) struct sockaddr *address = new_mac; DBG_ENTER(et131x_dbginfo); - // begin blux - // DBG_VERBOSE( et131x_dbginfo, "Function not implemented!!\n" ); + /* begin blux */ + /* DBG_VERBOSE( et131x_dbginfo, "Function not implemented!!\n" ); */ if (adapter == NULL) { DBG_LEAVE(et131x_dbginfo); @@ -808,22 +808,24 @@ int et131x_set_mac_addr(struct net_device *netdev, void *new_mac) et131x_handle_recv_interrupt(adapter); /* Set the new MAC */ - // netdev->set_mac_address = &new_mac; - // netdev->mtu = new_mtu; + /* netdev->set_mac_address = &new_mac; */ + /* netdev->mtu = new_mtu; */ memcpy(netdev->dev_addr, address->sa_data, netdev->addr_len); - printk("%s: Setting MAC address to %02x:%02x:%02x:%02x:%02x:%02x\n", - netdev->name, netdev->dev_addr[0], netdev->dev_addr[1], - netdev->dev_addr[2], netdev->dev_addr[3], netdev->dev_addr[4], - netdev->dev_addr[5]); + printk(KERN_INFO + "%s: Setting MAC address to %02x:%02x:%02x:%02x:%02x:%02x\n", + netdev->name, + netdev->dev_addr[0], netdev->dev_addr[1], + netdev->dev_addr[2], netdev->dev_addr[3], + netdev->dev_addr[4], netdev->dev_addr[5]); /* Free Rx DMA memory */ et131x_adapter_memory_free(adapter); /* Set the config parameter for Jumbo Packet support */ - // adapter->RegistryJumboPacket = new_mtu + 14; - // blux: not needet here, w'll change the MAC + /* adapter->RegistryJumboPacket = new_mtu + 14; */ + /* blux: not needet here, we'll change the MAC */ et131x_soft_reset(adapter); @@ -831,23 +833,22 @@ int et131x_set_mac_addr(struct net_device *netdev, void *new_mac) result = et131x_adapter_memory_alloc(adapter); if (result != 0) { DBG_WARNING(et131x_dbginfo, - "Change MAC failed; couldn't re-alloc DMA memory\n"); + "Change MAC failed; couldn't re-alloc DMA memory\n"); return result; } et131x_init_send(adapter); et131x_setup_hardware_properties(adapter); - // memcpy( netdev->dev_addr, adapter->CurrentAddress, ETH_ALEN ); - // blux: no, do not override our nice address + /* memcpy( netdev->dev_addr, adapter->CurrentAddress, ETH_ALEN ); */ + /* blux: no, do not override our nice address */ /* Init the device with the new settings */ et131x_adapter_setup(adapter); /* Enable interrupts */ - if (MP_TEST_FLAG(adapter, fMP_ADAPTER_INTERRUPT_IN_USE)) { + if (MP_TEST_FLAG(adapter, fMP_ADAPTER_INTERRUPT_IN_USE)) et131x_enable_interrupts(adapter); - } /* Restart the Tx and Rx DMA engines */ et131x_rx_dma_enable(adapter); |