diff options
Diffstat (limited to 'drivers/net/qla3xxx.c')
-rw-r--r-- | drivers/net/qla3xxx.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c index 1a3584edd79c..2d21c60085bc 100644 --- a/drivers/net/qla3xxx.c +++ b/drivers/net/qla3xxx.c | |||
@@ -379,7 +379,7 @@ static void fm93c56a_select(struct ql3_adapter *qdev) | |||
379 | { | 379 | { |
380 | struct ql3xxx_port_registers __iomem *port_regs = | 380 | struct ql3xxx_port_registers __iomem *port_regs = |
381 | qdev->mem_map_registers; | 381 | qdev->mem_map_registers; |
382 | u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg; | 382 | __iomem u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg; |
383 | 383 | ||
384 | qdev->eeprom_cmd_data = AUBURN_EEPROM_CS_1; | 384 | qdev->eeprom_cmd_data = AUBURN_EEPROM_CS_1; |
385 | ql_write_nvram_reg(qdev, spir, ISP_NVRAM_MASK | qdev->eeprom_cmd_data); | 385 | ql_write_nvram_reg(qdev, spir, ISP_NVRAM_MASK | qdev->eeprom_cmd_data); |
@@ -398,7 +398,7 @@ static void fm93c56a_cmd(struct ql3_adapter *qdev, u32 cmd, u32 eepromAddr) | |||
398 | u32 previousBit; | 398 | u32 previousBit; |
399 | struct ql3xxx_port_registers __iomem *port_regs = | 399 | struct ql3xxx_port_registers __iomem *port_regs = |
400 | qdev->mem_map_registers; | 400 | qdev->mem_map_registers; |
401 | u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg; | 401 | __iomem u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg; |
402 | 402 | ||
403 | /* Clock in a zero, then do the start bit */ | 403 | /* Clock in a zero, then do the start bit */ |
404 | ql_write_nvram_reg(qdev, spir, | 404 | ql_write_nvram_reg(qdev, spir, |
@@ -467,7 +467,7 @@ static void fm93c56a_deselect(struct ql3_adapter *qdev) | |||
467 | { | 467 | { |
468 | struct ql3xxx_port_registers __iomem *port_regs = | 468 | struct ql3xxx_port_registers __iomem *port_regs = |
469 | qdev->mem_map_registers; | 469 | qdev->mem_map_registers; |
470 | u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg; | 470 | __iomem u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg; |
471 | 471 | ||
472 | qdev->eeprom_cmd_data = AUBURN_EEPROM_CS_0; | 472 | qdev->eeprom_cmd_data = AUBURN_EEPROM_CS_0; |
473 | ql_write_nvram_reg(qdev, spir, ISP_NVRAM_MASK | qdev->eeprom_cmd_data); | 473 | ql_write_nvram_reg(qdev, spir, ISP_NVRAM_MASK | qdev->eeprom_cmd_data); |
@@ -483,7 +483,7 @@ static void fm93c56a_datain(struct ql3_adapter *qdev, unsigned short *value) | |||
483 | u32 dataBit; | 483 | u32 dataBit; |
484 | struct ql3xxx_port_registers __iomem *port_regs = | 484 | struct ql3xxx_port_registers __iomem *port_regs = |
485 | qdev->mem_map_registers; | 485 | qdev->mem_map_registers; |
486 | u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg; | 486 | __iomem u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg; |
487 | 487 | ||
488 | /* Read the data bits */ | 488 | /* Read the data bits */ |
489 | /* The first bit is a dummy. Clock right over it. */ | 489 | /* The first bit is a dummy. Clock right over it. */ |
@@ -3011,7 +3011,7 @@ static int ql_adapter_initialize(struct ql3_adapter *qdev) | |||
3011 | u32 value; | 3011 | u32 value; |
3012 | struct ql3xxx_port_registers __iomem *port_regs = | 3012 | struct ql3xxx_port_registers __iomem *port_regs = |
3013 | qdev->mem_map_registers; | 3013 | qdev->mem_map_registers; |
3014 | u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg; | 3014 | __iomem u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg; |
3015 | struct ql3xxx_host_memory_registers __iomem *hmem_regs = | 3015 | struct ql3xxx_host_memory_registers __iomem *hmem_regs = |
3016 | (void __iomem *)port_regs; | 3016 | (void __iomem *)port_regs; |
3017 | u32 delay = 10; | 3017 | u32 delay = 10; |