Commit 096e6224 authored by Mark Einon's avatar Mark Einon Committed by Greg Kroah-Hartman

staging: et131x: Fix whitespace - alignment matching open parenthesis

Fix occurrences in et131x.c of:

CHECK: Alignment should match open parenthesis
Signed-off-by: default avatarMark Einon <mark.einon@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bbf45bcf
...@@ -594,11 +594,11 @@ static int eeprom_write(struct et131x_adapter *adapter, u32 addr, u8 data) ...@@ -594,11 +594,11 @@ static int eeprom_write(struct et131x_adapter *adapter, u32 addr, u8 data)
* byte addressing). * byte addressing).
*/ */
if (pci_write_config_byte(pdev, LBCIF_CONTROL_REGISTER, if (pci_write_config_byte(pdev, LBCIF_CONTROL_REGISTER,
LBCIF_CONTROL_LBCIF_ENABLE | LBCIF_CONTROL_I2C_WRITE)) LBCIF_CONTROL_LBCIF_ENABLE |
LBCIF_CONTROL_I2C_WRITE))
return -EIO; return -EIO;
/* Prepare EEPROM address for Step 3 */ /* Prepare EEPROM address for Step 3 */
for (retries = 0; retries < MAX_NUM_WRITE_RETRIES; retries++) { for (retries = 0; retries < MAX_NUM_WRITE_RETRIES; retries++) {
/* Write the address to the LBCIF Address Register */ /* Write the address to the LBCIF Address Register */
if (pci_write_config_dword(pdev, LBCIF_ADDRESS_REGISTER, addr)) if (pci_write_config_dword(pdev, LBCIF_ADDRESS_REGISTER, addr))
...@@ -666,7 +666,8 @@ static int eeprom_write(struct et131x_adapter *adapter, u32 addr, u8 data) ...@@ -666,7 +666,8 @@ static int eeprom_write(struct et131x_adapter *adapter, u32 addr, u8 data)
addr); addr);
do { do {
pci_read_config_dword(pdev, pci_read_config_dword(pdev,
LBCIF_DATA_REGISTER, &val); LBCIF_DATA_REGISTER,
&val);
} while ((val & 0x00010000) == 0); } while ((val & 0x00010000) == 0);
} while (val & 0x00040000); } while (val & 0x00040000);
...@@ -771,7 +772,8 @@ static int et131x_init_eeprom(struct et131x_adapter *adapter) ...@@ -771,7 +772,8 @@ static int et131x_init_eeprom(struct et131x_adapter *adapter)
} }
if (pdev->revision != 0x01 || write_failed) { if (pdev->revision != 0x01 || write_failed) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"Fatal EEPROM Status Error - 0x%04x\n", eestatus); "Fatal EEPROM Status Error - 0x%04x\n",
eestatus);
/* This error could mean that there was an error /* This error could mean that there was an error
* reading the eeprom or that the eeprom doesn't exist. * reading the eeprom or that the eeprom doesn't exist.
...@@ -865,7 +867,7 @@ static void et131x_tx_dma_enable(struct et131x_adapter *adapter) ...@@ -865,7 +867,7 @@ static void et131x_tx_dma_enable(struct et131x_adapter *adapter)
/* Setup the transmit dma configuration register for normal /* Setup the transmit dma configuration register for normal
* operation * operation
*/ */
writel(ET_TXDMA_SNGL_EPKT|(PARM_DMA_CACHE_DEF << ET_TXDMA_CACHE_SHIFT), writel(ET_TXDMA_SNGL_EPKT | (PARM_DMA_CACHE_DEF << ET_TXDMA_CACHE_SHIFT),
&adapter->regs->txdma.csr); &adapter->regs->txdma.csr);
} }
...@@ -2092,7 +2094,8 @@ static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter) ...@@ -2092,7 +2094,8 @@ static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
GFP_KERNEL); GFP_KERNEL);
if (!fbr->ring_virtaddr) { if (!fbr->ring_virtaddr) {
dev_err(&adapter->pdev->dev, dev_err(&adapter->pdev->dev,
"Cannot alloc memory for Free Buffer Ring %d\n", id); "Cannot alloc memory for Free Buffer Ring %d\n",
id);
return -ENOMEM; return -ENOMEM;
} }
} }
...@@ -2252,7 +2255,8 @@ static void et131x_rx_dma_memory_free(struct et131x_adapter *adapter) ...@@ -2252,7 +2255,8 @@ static void et131x_rx_dma_memory_free(struct et131x_adapter *adapter)
if (rx_ring->rx_status_block) { if (rx_ring->rx_status_block) {
dma_free_coherent(&adapter->pdev->dev, dma_free_coherent(&adapter->pdev->dev,
sizeof(struct rx_status_block), sizeof(struct rx_status_block),
rx_ring->rx_status_block, rx_ring->rx_status_bus); rx_ring->rx_status_block,
rx_ring->rx_status_bus);
rx_ring->rx_status_block = NULL; rx_ring->rx_status_block = NULL;
} }
......
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