openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: slicoss: avoid CamelCases slicoss.c 

Replace CamelCases to comply with the standard kernel coding style.

Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sergio Paracuellos 2016-11-18 18:58:10 +01:00 committed by Greg Kroah-Hartman
parent 1081bb83a1
commit 608859b6b8
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/staging/slicoss/slicoss.c
View File

@ -629,15 +629,15 @@ static void slic_mac_config(struct adapter *adapter)
static void slic_config_set(struct adapter *adapter, bool linkchange) static void slic_config_set(struct adapter *adapter, bool linkchange)
{ {
u32 value; u32 value;
u32 RcrReset; u32 rcr_reset;
if (linkchange) { if (linkchange) {
/* Setup MAC */ /* Setup MAC */
slic_mac_config(adapter); slic_mac_config(adapter);
RcrReset = GRCR_RESET; rcr_reset = GRCR_RESET;
} else { } else {
slic_mac_address_config(adapter); slic_mac_address_config(adapter);
RcrReset = 0; rcr_reset = 0;
} }
if (adapter->linkduplex == LINK_FULLD) { if (adapter->linkduplex == LINK_FULLD) {
@ -649,7 +649,7 @@ static void slic_config_set(struct adapter *adapter, bool linkchange)
slic_write32(adapter, SLIC_REG_WXCFG, value); slic_write32(adapter, SLIC_REG_WXCFG, value);
/* Setup rcvcfg last */ /* Setup rcvcfg last */
value = (RcrReset | /* Reset, if linkchange */ value = (rcr_reset | /* Reset, if linkchange */
GRCR_CTLEN | /* Enable CTL frames */ GRCR_CTLEN | /* Enable CTL frames */
GRCR_ADDRAEN | /* Address A enable */ GRCR_ADDRAEN | /* Address A enable */
GRCR_RCVBAD | /* Rcv bad frames */ GRCR_RCVBAD | /* Rcv bad frames */
@ -662,7 +662,7 @@ static void slic_config_set(struct adapter *adapter, bool linkchange)
slic_write32(adapter, SLIC_REG_WXCFG, value); slic_write32(adapter, SLIC_REG_WXCFG, value);
/* Setup rcvcfg last */ /* Setup rcvcfg last */
value = (RcrReset | /* Reset, if linkchange */ value = (rcr_reset | /* Reset, if linkchange */
GRCR_ADDRAEN | /* Address A enable */ GRCR_ADDRAEN | /* Address A enable */
GRCR_RCVBAD | /* Rcv bad frames */ GRCR_RCVBAD | /* Rcv bad frames */
(GRCR_HASHSIZE << GRCR_HASHSIZE_SHIFT)); (GRCR_HASHSIZE << GRCR_HASHSIZE_SHIFT));
@ -2585,7 +2585,7 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
struct slic_shmemory *sm = &adapter->shmem; struct slic_shmemory *sm = &adapter->shmem;
struct slic_shmem_data *sm_data = sm->shmem_data; struct slic_shmem_data *sm_data = sm->shmem_data;
struct slic_eeprom *peeprom; struct slic_eeprom *peeprom;
struct oslic_eeprom *pOeeprom; struct oslic_eeprom *poeeprom;
dma_addr_t phys_config; dma_addr_t phys_config;
u32 phys_configh; u32 phys_configh;
u32 phys_configl; u32 phys_configl;
@ -2681,14 +2681,14 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
/* Oasis card */ /* Oasis card */
case SLIC_2GB_DEVICE_ID: case SLIC_2GB_DEVICE_ID:
/* extract EEPROM data and pointers to EEPROM data */ /* extract EEPROM data and pointers to EEPROM data */
pOeeprom = (struct oslic_eeprom *)peeprom; poeeprom = (struct oslic_eeprom *)peeprom;
eecodesize = pOeeprom->eecode_size; eecodesize = poeeprom->eecode_size;
dramsize = pOeeprom->dram_size; dramsize = poeeprom->dram_size;
pmac = pOeeprom->mac_info; pmac = poeeprom->mac_info;
fruformat = pOeeprom->fru_format; fruformat = poeeprom->fru_format;
patkfru = &pOeeprom->atk_fru; patkfru = &poeeprom->atk_fru;
oemfruformat = pOeeprom->oem_fru_format; oemfruformat = poeeprom->oem_fru_format;
poemfru = &pOeeprom->oem_fru; poemfru = &poeeprom->oem_fru;
macaddrs = 2; macaddrs = 2;
/* /*
* Minor kludge for Oasis card * Minor kludge for Oasis card