aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/atl1/atl1_hw.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/net/atl1/atl1_hw.c b/drivers/net/atl1/atl1_hw.c
index 5b9dd3c1e84b..ef886bdeac13 100644
--- a/drivers/net/atl1/atl1_hw.c
+++ b/drivers/net/atl1/atl1_hw.c
@@ -2,20 +2,20 @@
2 * Copyright(c) 2005 - 2006 Attansic Corporation. All rights reserved. 2 * Copyright(c) 2005 - 2006 Attansic Corporation. All rights reserved.
3 * Copyright(c) 2006 Chris Snook <csnook@redhat.com> 3 * Copyright(c) 2006 Chris Snook <csnook@redhat.com>
4 * Copyright(c) 2006 Jay Cliburn <jcliburn@gmail.com> 4 * Copyright(c) 2006 Jay Cliburn <jcliburn@gmail.com>
5 * 5 *
6 * Derived from Intel e1000 driver 6 * Derived from Intel e1000 driver
7 * Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved. 7 * Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.
8 * 8 *
9 * This program is free software; you can redistribute it and/or modify it 9 * This program is free software; you can redistribute it and/or modify it
10 * under the terms of the GNU General Public License as published by the Free 10 * under the terms of the GNU General Public License as published by the Free
11 * Software Foundation; either version 2 of the License, or (at your option) 11 * Software Foundation; either version 2 of the License, or (at your option)
12 * any later version. 12 * any later version.
13 * 13 *
14 * This program is distributed in the hope that it will be useful, but WITHOUT 14 * This program is distributed in the hope that it will be useful, but WITHOUT
15 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 15 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
16 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for 16 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
17 * more details. 17 * more details.
18 * 18 *
19 * You should have received a copy of the GNU General Public License along with 19 * You should have received a copy of the GNU General Public License along with
20 * this program; if not, write to the Free Software Foundation, Inc., 59 20 * this program; if not, write to the Free Software Foundation, Inc., 59
21 * Temple Place - Suite 330, Boston, MA 02111-1307, USA. 21 * Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -42,9 +42,9 @@ s32 atl1_reset_hw(struct atl1_hw *hw)
42 u32 icr; 42 u32 icr;
43 int i; 43 int i;
44 44
45 /* 45 /*
46 * Clear Interrupt mask to stop board from generating 46 * Clear Interrupt mask to stop board from generating
47 * interrupts & Clear any pending interrupt events 47 * interrupts & Clear any pending interrupt events
48 */ 48 */
49 /* 49 /*
50 * iowrite32(0, hw->hw_addr + REG_IMR); 50 * iowrite32(0, hw->hw_addr + REG_IMR);
@@ -137,8 +137,8 @@ s32 atl1_read_phy_reg(struct atl1_hw *hw, u16 reg_addr, u16 *phy_data)
137 int i; 137 int i;
138 138
139 val = ((u32) (reg_addr & MDIO_REG_ADDR_MASK)) << MDIO_REG_ADDR_SHIFT | 139 val = ((u32) (reg_addr & MDIO_REG_ADDR_MASK)) << MDIO_REG_ADDR_SHIFT |
140 MDIO_START | MDIO_SUP_PREAMBLE | MDIO_RW | MDIO_CLK_25_4 << 140 MDIO_START | MDIO_SUP_PREAMBLE | MDIO_RW | MDIO_CLK_25_4 <<
141 MDIO_CLK_SEL_SHIFT; 141 MDIO_CLK_SEL_SHIFT;
142 iowrite32(val, hw->hw_addr + REG_MDIO_CTRL); 142 iowrite32(val, hw->hw_addr + REG_MDIO_CTRL);
143 ioread32(hw->hw_addr + REG_MDIO_CTRL); 143 ioread32(hw->hw_addr + REG_MDIO_CTRL);
144 144
@@ -205,7 +205,7 @@ static bool atl1_spi_read(struct atl1_hw *hw, u32 addr, u32 *buf)
205 205
206/* 206/*
207 * get_permanent_address 207 * get_permanent_address
208 * return 0 if get valid mac address, 208 * return 0 if get valid mac address,
209 */ 209 */
210static int atl1_get_permanent_address(struct atl1_hw *hw) 210static int atl1_get_permanent_address(struct atl1_hw *hw)
211{ 211{
@@ -302,7 +302,7 @@ static int atl1_get_permanent_address(struct atl1_hw *hw)
302} 302}
303 303
304/* 304/*
305 * Reads the adapter's MAC address from the EEPROM 305 * Reads the adapter's MAC address from the EEPROM
306 * hw - Struct containing variables accessed by shared code 306 * hw - Struct containing variables accessed by shared code
307 */ 307 */
308s32 atl1_read_mac_addr(struct atl1_hw *hw) 308s32 atl1_read_mac_addr(struct atl1_hw *hw)
@@ -629,7 +629,7 @@ static void atl1_init_flash_opcode(struct atl1_hw *hw)
629 * Performs basic configuration of the adapter. 629 * Performs basic configuration of the adapter.
630 * hw - Struct containing variables accessed by shared code 630 * hw - Struct containing variables accessed by shared code
631 * Assumes that the controller has previously been reset and is in a 631 * Assumes that the controller has previously been reset and is in a
632 * post-reset uninitialized state. Initializes multicast table, 632 * post-reset uninitialized state. Initializes multicast table,
633 * and Calls routines to setup link 633 * and Calls routines to setup link
634 * Leaves the transmit and receive units disabled and uninitialized. 634 * Leaves the transmit and receive units disabled and uninitialized.
635 */ 635 */