lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Tested on an ET-131x device.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Mark Einon
2011-07-10 16:35:28 +01:00
committed by Greg Kroah-Hartman
parent 99fa7e1492
commit c2329af4b9
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/et131x/et1310_phy.c
View File

@@ -811,7 +811,7 @@ void et131x_mii_check(struct et131x_adapter *etdev,
* plugged back in * plugged back in
*/ */
if (etdev->RegistryPhyComa == 1) if (etdev->RegistryPhyComa == 1)
EnablePhyComa(etdev); et1310_enable_phy_coma(etdev);
} }
} }

8
drivers/staging/et131x/et1310_pm.c
View File

@@ -87,7 +87,7 @@
#include "et131x.h" #include "et131x.h"
/** /**
* EnablePhyComa - called when network cable is unplugged * et1310_enable_phy_coma - called when network cable is unplugged
* @etdev: pointer to our adapter structure * @etdev: pointer to our adapter structure
* *
* driver receive an phy status change interrupt while in D0 and check that * driver receive an phy status change interrupt while in D0 and check that
@@ -106,7 +106,7 @@
* indicating linkup status, call the MPDisablePhyComa routine to * indicating linkup status, call the MPDisablePhyComa routine to
* restore JAGCore and gigE PHY * restore JAGCore and gigE PHY
*/ */
void EnablePhyComa(struct et131x_adapter *etdev) void et1310_enable_phy_coma(struct et131x_adapter *etdev)
{ {
unsigned long flags; unsigned long flags;
u32 pmcsr; u32 pmcsr;
@@ -136,10 +136,10 @@ void EnablePhyComa(struct et131x_adapter *etdev)
} }
/** /**
* DisablePhyComa - Disable the Phy Coma Mode * et1310_disable_phy_coma - Disable the Phy Coma Mode
* @etdev: pointer to our adapter structure * @etdev: pointer to our adapter structure
*/ */
void DisablePhyComa(struct et131x_adapter *etdev) void et1310_disable_phy_coma(struct et131x_adapter *etdev)
{ {
u32 pmcsr; u32 pmcsr;

8
drivers/staging/et131x/et131x.h
View File

@@ -85,11 +85,11 @@ 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);
/* et131x_pm.c */ /* et1310_pm.c */
void EnablePhyComa(struct et131x_adapter *adapter); void et1310_enable_phy_coma(struct et131x_adapter *adapter);
void DisablePhyComa(struct et131x_adapter *adapter); void et1310_disable_phy_coma(struct et131x_adapter *adapter);
/* et131x_phy.c */ /* et1310_phy.c */
void et1310_phy_init(struct et131x_adapter *adapter); void et1310_phy_init(struct et131x_adapter *adapter);
void et1310_phy_reset(struct et131x_adapter *adapter); void et1310_phy_reset(struct et131x_adapter *adapter);
void et1310_phy_power_down(struct et131x_adapter *adapter, bool down); void et1310_phy_power_down(struct et131x_adapter *adapter, bool down);

2
drivers/staging/et131x/et131x_initpci.c
View File

@@ -288,7 +288,7 @@ void et131x_error_timer_handler(unsigned long data)
* interrupt'. How to do that under Linux? * interrupt'. How to do that under Linux?
*/ */
et131x_enable_interrupts(etdev); et131x_enable_interrupts(etdev);
EnablePhyComa(etdev); et1310_enable_phy_coma(etdev);
} }
} }
} }

2
drivers/staging/et131x/et131x_isr.c
View File

@@ -379,7 +379,7 @@ void et131x_isr_handler(struct work_struct *work)
* so, disable it because we will not be able * so, disable it because we will not be able
* to read PHY values until we are out. * to read PHY values until we are out.
*/ */
DisablePhyComa(etdev); et1310_disable_phy_coma(etdev);
} }
/* Read the PHY ISR to clear the reason for the /* Read the PHY ISR to clear the reason for the