1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
register the ethernet devices as ethX
ixp400_eth.c | 41 +++++++++++++++++++----------------------
1 file changed, 19 insertions(+), 22 deletions(-)
--- ixp400-eth/ixp400_eth.c 1970-01-01 00:00:00.000000000 +0000
+++ ixp400-eth/ixp400_eth.c 1970-01-01 00:00:00.000000000 +0000
@@ -160,9 +160,6 @@ MODULE_PARM_DESC(phy_reset, "If non-zero
MODULE_PARM(dev_max_count, "i");
MODULE_PARM_DESC(dev_max_count, "Number of devices to initialize");
-/* devices will be called ixp0 and ixp1 */
-#define DEVICE_NAME "ixp"
-
/* boolean values for PHY link speed, duplex, and autonegotiation */
#define PHY_SPEED_10 0
#define PHY_SPEED_100 1
@@ -1570,7 +1568,7 @@ static int dev_pmu_timer_setup(void)
if (request_irq(IX_OSAL_IXP400_XSCALE_PMU_IRQ_LVL,
dev_pmu_timer_os_isr,
SA_SHIRQ,
- DEVICE_NAME,
+ MODULE_NAME,
(void *)IRQ_ANY_PARAMETER))
{
P_ERROR("Failed to reassign irq to PMU timer interrupt!\n");
@@ -3009,8 +3008,8 @@ static int phy_init(void)
if (port_id == IX_ETH_PORT_2) npe_id = "C";
if (port_id == IX_ETH_PORT_3) npe_id = "A";
- P_INFO("%s%d is using NPE%s and the PHY at address %d\n",
- DEVICE_NAME, dev_count, npe_id, phyAddresses[port_id]);
+ P_INFO("ethernet %d using NPE%s and the PHY at address %d\n",
+ dev_count, npe_id, phyAddresses[port_id]);
/* Set the MAC to the same duplex mode as the phy */
ixEthAccPortDuplexModeSet(port_id,
@@ -3215,9 +3215,6 @@ static int __devinit dev_eth_probe(struc
/* set the private port ID */
priv->port_id = portId;
- /* set device name */
- sprintf(ndev->name, DEVICE_NAME"%d", priv->port_id);
-
TRACE;
/* initialize RX pool */
|
