Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: et131x: Remove section comments

Following the move to put the driver into one file, comments were added to identify which source file each set of functions originated from.
These no longer made sense after functions were moved around to remove some forward declarations, so remove them.

A function comment was previously not moved along with its function, now they are reunited.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

Mark Einon and committed by
Greg Kroah-Hartman
54dbf04f d14e3d05

+11 -35
+11 -35
drivers/staging/et131x/et131x.c
··· 177 177 178 178 /* RX defines */ 179 179 #define USE_FBR0 1 180 - 181 180 #define FBR_CHUNKS 32 182 - 183 181 #define MAX_DESC_PER_RING_RX 1024 184 182 185 183 /* number of RFDs - default and min */ ··· 192 194 #endif 193 195 194 196 #define NIC_MIN_NUM_RFD 64 195 - 196 197 #define NUM_PACKETS_HANDLED 256 197 198 198 199 #define ALCATEL_MULTICAST_PKT 0x01000000 ··· 423 426 int since_irq; 424 427 }; 425 428 426 - /* ADAPTER defines */ 427 429 /* 428 430 * Do not change these values: if changed, then change also in respective 429 431 * TXdma and Rxdma engines ··· 570 574 571 575 struct net_device_stats net_stats; 572 576 }; 573 - 574 - /* EEPROM functions */ 575 577 576 578 static int eeprom_wait_ready(struct pci_dev *pdev, u32 *status) 577 579 { ··· 939 945 { 940 946 *v = INDEX12(*v + n) | (*v & ET_DMA12_WRAP); 941 947 } 942 - 943 - /** 944 - * nic_rx_pkts - Checks the hardware for available packets 945 - * @adapter: pointer to our adapter 946 - * 947 - * Returns rfd, a pointer to our MPRFD. 948 - * 949 - * Checks the hardware for available packets, using completion ring 950 - * If packets are available, it gets an RFD from the recv_list, attaches 951 - * the packet to it, puts the RFD in the RecvPendList, and also returns 952 - * the pointer to the RFD. 953 - */ 954 - /* MAC functions */ 955 948 956 949 /** 957 950 * et1310_config_mac_regs1 - Initialize the first part of MAC regs ··· 1696 1715 adapter->stats.tx_collisions += COUNTER_WRAP_12_BIT; 1697 1716 } 1698 1717 1699 - /* PHY functions */ 1700 - 1701 1718 static int et131x_mdio_read(struct mii_bus *bus, int phy_addr, int reg) 1702 1719 { 1703 1720 struct net_device *netdev = bus->priv; ··· 1842 1863 */ 1843 1864 writel(0, &regs->watchdog_timer); 1844 1865 } 1845 - 1846 - /* PM functions */ 1847 1866 1848 1867 /** 1849 1868 * et131x_config_rx_dma_regs - Start of Rx_DMA init sequence ··· 2248 2271 2249 2272 et131x_enable_txrx(adapter->netdev); 2250 2273 } 2251 - 2252 - /* RX functions */ 2253 2274 2254 2275 static inline u32 bump_free_buff_ring(u32 *free_buff_ring, u32 limit) 2255 2276 { ··· 2894 2919 WARN_ON(rx_local->num_ready_recv > rx_local->num_rfd); 2895 2920 } 2896 2921 2922 + /** 2923 + * nic_rx_pkts - Checks the hardware for available packets 2924 + * @adapter: pointer to our adapter 2925 + * 2926 + * Returns rfd, a pointer to our MPRFD. 2927 + * 2928 + * Checks the hardware for available packets, using completion ring 2929 + * If packets are available, it gets an RFD from the recv_list, attaches 2930 + * the packet to it, puts the RFD in the RecvPendList, and also returns 2931 + * the pointer to the RFD. 2932 + */ 2897 2933 static struct rfd *nic_rx_pkts(struct et131x_adapter *adapter) 2898 2934 { 2899 2935 struct rx_ring *rx_local = &adapter->rx_ring; ··· 3174 3188 /* Watchdog timer will disable itself if appropriate. */ 3175 3189 adapter->rx_ring.unfinished_receives = false; 3176 3190 } 3177 - 3178 - /* TX functions */ 3179 3191 3180 3192 /** 3181 3193 * et131x_tx_dma_memory_alloc ··· 3783 3799 spin_unlock_irqrestore(&adapter->tcb_send_qlock, flags); 3784 3800 } 3785 3801 3786 - /* ETHTOOL functions */ 3787 - 3788 3802 static int et131x_get_settings(struct net_device *netdev, 3789 3803 struct ethtool_cmd *cmd) 3790 3804 { ··· 3952 3970 { 3953 3971 SET_ETHTOOL_OPS(netdev, &et131x_ethtool_ops); 3954 3972 } 3955 - 3956 - /* PCI functions */ 3957 3973 3958 3974 /** 3959 3975 * et131x_hwaddr_init - set up the MAC Address on the ET1310 ··· 4463 4483 #define ET131X_PM_OPS NULL 4464 4484 #endif 4465 4485 4466 - /* ISR functions */ 4467 - 4468 4486 /** 4469 4487 * et131x_isr - The Interrupt Service Routine for the driver. 4470 4488 * @irq: the IRQ on which the interrupt was received. ··· 4759 4781 } 4760 4782 et131x_enable_interrupts(adapter); 4761 4783 } 4762 - 4763 - /* NETDEV functions */ 4764 4784 4765 4785 /** 4766 4786 * et131x_stats - Return the current device statistics.