staging: et131x: Convert et1310_tx.c function name from CamelCase
PATCH 1/3 staging: et131x: Convert et1310_tx.c function name from CamelCase
Tested on an ET-131x device.
Signed-off-by Mark Einon <[email protected]>
--- drivers/staging/et131x/et131x.h | 3 +-- drivers/staging/et131x/et131x_initpci.c | 12 ++---------- 2 files changed, 3 insertions(+), 12 deletions(-)
drivers/staging/et131x/et131x.h +1 -2
@@ -52,8 +52,7 @@int et131x_init_eeprom (struct et131x_adapter *etdev);/* et131x_initpci.c */ -void ConfigGlobalRegs (struct et131x_adapter *pAdapter); -void ConfigMMCRegs (struct et131x_adapter *pAdapter); +void et131x_config_global_regs (struct et131x_adapter *pAdapter);void et131x_enable_interrupts (struct et131x_adapter *adapter);void et131x_disable_interrupts (struct et131x_adapter *adapter); void et131x_align_allocated_memory(struct et131x_adapter *adapter,
drivers/staging/et131x/et131x_initpci.c +2 -10
@@ -325,7 +325,7 @@ void et131x_link_detection_handler(unsigned long data)* * Used to configure the global registers on the JAGCore */ -void ConfigGlobalRegs (struct et131x_adapter *etdev) +void et131x_configure_global_regs (struct et131x_adapter *etdev) {struct global_regs __iomem *regs = &etdev->regs->global;
@@ -366,7 +366,6 @@ void ConfigGlobalRegs(struct et131x_adapter *etdev)writel (0 , ®s->watchdog_timer); } -/** * et131x_adapter_setup - Set the adapter up as per cassini+ documentation * @etdev: pointer to our private adapter structure
@@ -378,7 +377,7 @@ int et131x_adapter_setup(struct et131x_adapter *etdev)int status =0 ;/* Configure the JAGCore */ -ConfigGlobalRegs (etdev); +et131x_configure_global_regs (etdev);et1310_config_mac_regs1 (etdev);
@@ -517,8 +516,6 @@ void et131x_adapter_memory_free(struct et131x_adapter *adapter)et131x_rx_dma_memory_free (adapter); } - -/** * et131x_adapter_init * @etdev: pointer to the private adapter struct
@@ -527,8 +524,6 @@ void et131x_adapter_memory_free(struct et131x_adapter *adapter)* Initialize the data structures for the et131x_adapter object and link * them together with the platform provided device structures. */ - -static struct et131x_adapter *et131x_adapter_init (struct net_device *netdev,struct pci_dev *pdev) {
@@ -602,7 +597,6 @@ static struct et131x_adapter *et131x_adapter_init(struct net_device *netdev,* contained in the pci_device_id table. This routine is the equivalent to * a device insertion routine. */ -static int __devinit et131x_pci_setup (struct pci_dev *pdev,const struct pci_device_id *ent) {
@@ -774,7 +768,6 @@ err_disable:* PCI subsystem detects that a PCI device which matches the information * contained in the pci_device_id table has been removed. */ - static void __devexit et131x_pci_remove(struct pci_dev *pdev) {struct net_device *netdev;
@@ -815,7 +808,6 @@ static struct pci_driver et131x_driver = { .resume = NULL, /* et131x_pci_resume */ }; -/** * et131x_init_module - The "main" entry point called on driver initialization *
Signature · 1 line
1.7.4.4
PATCH 2/3 staging: et131x: Removing commented out code implemented elsewhere
Function et131x_set_mac_addr() contains commented out code that has been moved to et131x_change_mtu() in the same file.
Signed-off-by Mark Einon <[email protected]>
--- drivers/staging/et131x/et131x_netdev.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-)
drivers/staging/et131x/et131x_netdev.c +0 -5
@@ -593,7 +593,6 @@ int et131x_set_mac_addr(struct net_device *netdev, void *new_mac)/* Set the new MAC */ /* netdev->set_mac_address = &new_mac; */ -/* netdev->mtu = new_mtu; */ memcpy (netdev->dev_addr, address->sa_data, netdev->addr_len);
@@ -603,10 +602,6 @@ int et131x_set_mac_addr(struct net_device *netdev, void *new_mac)/* Free Rx DMA memory */ et131x_adapter_memory_free (adapter); -/* Set the config parameter for Jumbo Packet support */ -/* adapter->registry_jumbo_packet = new_mtu + 14; */ -/* blux: not needet here, we'll change the MAC */ -et131x_soft_reset (adapter);/* Alloc and init Rx DMA memory */
Signature · 1 line
1.7.4.4
PATCH 3/3 staging: et131x: Fix variable typo carry_reg1 -> carry_reg2
In reply to Mark EinonThis mistake was introduced in the patch 'staging: et131x: Convert et1310_address_map.h names from camel case'
Signed-off-by Mark Einon <[email protected]>
--- drivers/staging/et131x/et1310_mac.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/staging/et131x/et1310_mac.c +1 -1
@@ -526,7 +526,7 @@ void et1310_handle_macstat_interrupt(struct et131x_adapter *etdev) carry_reg1 =readl (&etdev->regs->macstat.carry_reg1); carry_reg2 =readl (&etdev->regs->macstat.carry_reg2); -writel (carry_reg2, &etdev->regs->macstat.carry_reg1); +writel (carry_reg1, &etdev->regs->macstat.carry_reg1);writel (carry_reg2, &etdev->regs->macstat.carry_reg2);/* We need to do update the host copy of all the MAC_STAT counters.
Signature · 1 line
1.7.4.4