diff options
Diffstat (limited to 'drivers/infiniband/hw/nes/nes_utils.c')
-rw-r--r-- | drivers/infiniband/hw/nes/nes_utils.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/infiniband/hw/nes/nes_utils.c b/drivers/infiniband/hw/nes/nes_utils.c index 186623d86959..a9f5dd272f1a 100644 --- a/drivers/infiniband/hw/nes/nes_utils.c +++ b/drivers/infiniband/hw/nes/nes_utils.c | |||
@@ -381,12 +381,8 @@ static u16 nes_read16_eeprom(void __iomem *addr, u16 offset) | |||
381 | */ | 381 | */ |
382 | void nes_write_1G_phy_reg(struct nes_device *nesdev, u8 phy_reg, u8 phy_addr, u16 data) | 382 | void nes_write_1G_phy_reg(struct nes_device *nesdev, u8 phy_reg, u8 phy_addr, u16 data) |
383 | { | 383 | { |
384 | struct nes_adapter *nesadapter = nesdev->nesadapter; | ||
385 | u32 u32temp; | 384 | u32 u32temp; |
386 | u32 counter; | 385 | u32 counter; |
387 | unsigned long flags; | ||
388 | |||
389 | spin_lock_irqsave(&nesadapter->phy_lock, flags); | ||
390 | 386 | ||
391 | nes_write_indexed(nesdev, NES_IDX_MAC_MDIO_CONTROL, | 387 | nes_write_indexed(nesdev, NES_IDX_MAC_MDIO_CONTROL, |
392 | 0x50020000 | data | ((u32)phy_reg << 18) | ((u32)phy_addr << 23)); | 388 | 0x50020000 | data | ((u32)phy_reg << 18) | ((u32)phy_addr << 23)); |
@@ -402,8 +398,6 @@ void nes_write_1G_phy_reg(struct nes_device *nesdev, u8 phy_reg, u8 phy_addr, u1 | |||
402 | if (!(u32temp & 1)) | 398 | if (!(u32temp & 1)) |
403 | nes_debug(NES_DBG_PHY, "Phy is not responding. interrupt status = 0x%X.\n", | 399 | nes_debug(NES_DBG_PHY, "Phy is not responding. interrupt status = 0x%X.\n", |
404 | u32temp); | 400 | u32temp); |
405 | |||
406 | spin_unlock_irqrestore(&nesadapter->phy_lock, flags); | ||
407 | } | 401 | } |
408 | 402 | ||
409 | 403 | ||
@@ -414,14 +408,11 @@ void nes_write_1G_phy_reg(struct nes_device *nesdev, u8 phy_reg, u8 phy_addr, u1 | |||
414 | */ | 408 | */ |
415 | void nes_read_1G_phy_reg(struct nes_device *nesdev, u8 phy_reg, u8 phy_addr, u16 *data) | 409 | void nes_read_1G_phy_reg(struct nes_device *nesdev, u8 phy_reg, u8 phy_addr, u16 *data) |
416 | { | 410 | { |
417 | struct nes_adapter *nesadapter = nesdev->nesadapter; | ||
418 | u32 u32temp; | 411 | u32 u32temp; |
419 | u32 counter; | 412 | u32 counter; |
420 | unsigned long flags; | ||
421 | 413 | ||
422 | /* nes_debug(NES_DBG_PHY, "phy addr = %d, mac_index = %d\n", | 414 | /* nes_debug(NES_DBG_PHY, "phy addr = %d, mac_index = %d\n", |
423 | phy_addr, nesdev->mac_index); */ | 415 | phy_addr, nesdev->mac_index); */ |
424 | spin_lock_irqsave(&nesadapter->phy_lock, flags); | ||
425 | 416 | ||
426 | nes_write_indexed(nesdev, NES_IDX_MAC_MDIO_CONTROL, | 417 | nes_write_indexed(nesdev, NES_IDX_MAC_MDIO_CONTROL, |
427 | 0x60020000 | ((u32)phy_reg << 18) | ((u32)phy_addr << 23)); | 418 | 0x60020000 | ((u32)phy_reg << 18) | ((u32)phy_addr << 23)); |
@@ -441,7 +432,6 @@ void nes_read_1G_phy_reg(struct nes_device *nesdev, u8 phy_reg, u8 phy_addr, u16 | |||
441 | } else { | 432 | } else { |
442 | *data = (u16)nes_read_indexed(nesdev, NES_IDX_MAC_MDIO_CONTROL); | 433 | *data = (u16)nes_read_indexed(nesdev, NES_IDX_MAC_MDIO_CONTROL); |
443 | } | 434 | } |
444 | spin_unlock_irqrestore(&nesadapter->phy_lock, flags); | ||
445 | } | 435 | } |
446 | 436 | ||
447 | 437 | ||