Commit 1de13783 authored by Mark Einon's avatar Mark Einon Committed by Greg Kroah-Hartman

staging: et131x: Converting et1310_mac.c function and local names from CamelCase

Tested on an ET-131x device.
Signed-off-by: default avatarMark Einon <mark.einon@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent fcb8ce5c
This diff is collapsed.
...@@ -850,7 +850,7 @@ void et131x_Mii_check(struct et131x_adapter *etdev, ...@@ -850,7 +850,7 @@ void et131x_Mii_check(struct et131x_adapter *etdev,
MiWrite(etdev, 0x12, Register18); MiWrite(etdev, 0x12, Register18);
} }
ConfigFlowControl(etdev); config_flow_control(etdev);
if (etdev->linkspeed == TRUEPHY_SPEED_1000MBPS && if (etdev->linkspeed == TRUEPHY_SPEED_1000MBPS &&
etdev->RegistryJumboPacket > 2048) etdev->RegistryJumboPacket > 2048)
...@@ -858,7 +858,7 @@ void et131x_Mii_check(struct et131x_adapter *etdev, ...@@ -858,7 +858,7 @@ void et131x_Mii_check(struct et131x_adapter *etdev,
0x2000); 0x2000);
SetRxDmaTimer(etdev); SetRxDmaTimer(etdev);
ConfigMACRegs2(etdev); config_mac_regs2(etdev);
} }
} }
} }
......
...@@ -71,16 +71,16 @@ irqreturn_t et131x_isr(int irq, void *dev_id); ...@@ -71,16 +71,16 @@ irqreturn_t et131x_isr(int irq, void *dev_id);
void et131x_isr_handler(struct work_struct *work); void et131x_isr_handler(struct work_struct *work);
/* et1310_mac.c */ /* et1310_mac.c */
void ConfigMACRegs1(struct et131x_adapter *adapter); void config_mac_regs1(struct et131x_adapter *adapter);
void ConfigMACRegs2(struct et131x_adapter *adapter); void config_mac_regs2(struct et131x_adapter *adapter);
void ConfigRxMacRegs(struct et131x_adapter *adapter); void config_rxmac_regs(struct et131x_adapter *adapter);
void ConfigTxMacRegs(struct et131x_adapter *adapter); void config_txmac_regs(struct et131x_adapter *adapter);
void ConfigMacStatRegs(struct et131x_adapter *adapter); void config_macstat_regs(struct et131x_adapter *adapter);
void ConfigFlowControl(struct et131x_adapter *adapter); void config_flow_control(struct et131x_adapter *adapter);
void UpdateMacStatHostCounters(struct et131x_adapter *adapter); void update_macstat_host_counters(struct et131x_adapter *adapter);
void HandleMacStatInterrupt(struct et131x_adapter *adapter); void handle_macstat_interrupt(struct et131x_adapter *adapter);
void SetupDeviceForMulticast(struct et131x_adapter *adapter); void setup_device_for_multicast(struct et131x_adapter *adapter);
void SetupDeviceForUnicast(struct et131x_adapter *adapter); void setup_device_for_unicast(struct et131x_adapter *adapter);
/* et131x_netdev.c */ /* et131x_netdev.c */
struct net_device *et131x_device_alloc(void); struct net_device *et131x_device_alloc(void);
......
...@@ -269,7 +269,7 @@ void et131x_error_timer_handler(unsigned long data) ...@@ -269,7 +269,7 @@ void et131x_error_timer_handler(unsigned long data)
pm_csr = readl(&etdev->regs->global.pm_csr); pm_csr = readl(&etdev->regs->global.pm_csr);
if ((pm_csr & ET_PM_PHY_SW_COMA) == 0) if ((pm_csr & ET_PM_PHY_SW_COMA) == 0)
UpdateMacStatHostCounters(etdev); update_macstat_host_counters(etdev);
else else
dev_err(&etdev->pdev->dev, dev_err(&etdev->pdev->dev,
"No interrupts, in PHY coma, pm_csr = 0x%x\n", pm_csr); "No interrupts, in PHY coma, pm_csr = 0x%x\n", pm_csr);
...@@ -369,7 +369,7 @@ void ConfigGlobalRegs(struct et131x_adapter *etdev) ...@@ -369,7 +369,7 @@ void ConfigGlobalRegs(struct et131x_adapter *etdev)
/** /**
* et131x_adapter_setup - Set the adapter up as per cassini+ documentation * et131x_adapter_setup - Set the adapter up as per cassini+ documentation
* @adapter: pointer to our private adapter structure * @etdev: pointer to our private adapter structure
* *
* Returns 0 on success, errno on failure (as defined in errno.h) * Returns 0 on success, errno on failure (as defined in errno.h)
*/ */
...@@ -380,19 +380,19 @@ int et131x_adapter_setup(struct et131x_adapter *etdev) ...@@ -380,19 +380,19 @@ int et131x_adapter_setup(struct et131x_adapter *etdev)
/* Configure the JAGCore */ /* Configure the JAGCore */
ConfigGlobalRegs(etdev); ConfigGlobalRegs(etdev);
ConfigMACRegs1(etdev); config_mac_regs1(etdev);
/* Configure the MMC registers */ /* Configure the MMC registers */
/* All we need to do is initialize the Memory Control Register */ /* All we need to do is initialize the Memory Control Register */
writel(ET_MMC_ENABLE, &etdev->regs->mmc.mmc_ctrl); writel(ET_MMC_ENABLE, &etdev->regs->mmc.mmc_ctrl);
ConfigRxMacRegs(etdev); config_rxmac_regs(etdev);
ConfigTxMacRegs(etdev); config_txmac_regs(etdev);
ConfigRxDmaRegs(etdev); ConfigRxDmaRegs(etdev);
ConfigTxDmaRegs(etdev); ConfigTxDmaRegs(etdev);
ConfigMacStatRegs(etdev); config_macstat_regs(etdev);
/* Move the following code to Timer function?? */ /* Move the following code to Timer function?? */
status = et131x_xcvr_find(etdev); status = et131x_xcvr_find(etdev);
......
...@@ -460,7 +460,7 @@ void et131x_isr_handler(struct work_struct *work) ...@@ -460,7 +460,7 @@ void et131x_isr_handler(struct work_struct *work)
* to maintain the top, software managed bits of the * to maintain the top, software managed bits of the
* counter(s). * counter(s).
*/ */
HandleMacStatInterrupt(etdev); handle_macstat_interrupt(etdev);
} }
/* Handle SLV Timeout Interrupt */ /* Handle SLV Timeout Interrupt */
......
...@@ -301,14 +301,14 @@ int et131x_set_packet_filter(struct et131x_adapter *adapter) ...@@ -301,14 +301,14 @@ int et131x_set_packet_filter(struct et131x_adapter *adapter)
if (filter & ET131X_PACKET_TYPE_ALL_MULTICAST) if (filter & ET131X_PACKET_TYPE_ALL_MULTICAST)
pf_ctrl &= ~2; /* Multicast filter bit */ pf_ctrl &= ~2; /* Multicast filter bit */
else { else {
SetupDeviceForMulticast(adapter); setup_device_for_multicast(adapter);
pf_ctrl |= 2; pf_ctrl |= 2;
ctrl &= ~0x04; ctrl &= ~0x04;
} }
/* Set us up with Unicast packet filtering */ /* Set us up with Unicast packet filtering */
if (filter & ET131X_PACKET_TYPE_DIRECTED) { if (filter & ET131X_PACKET_TYPE_DIRECTED) {
SetupDeviceForUnicast(adapter); setup_device_for_unicast(adapter);
pf_ctrl |= 4; pf_ctrl |= 4;
ctrl &= ~0x04; ctrl &= ~0x04;
} }
......
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