qlge: Get rid of volatile usage for shadow register.

[linux-2.6-omap-h63xx.git] / drivers / net / qlge / qlge_dbg.c

diff --git a/drivers/net/qlge/qlge_dbg.c b/drivers/net/qlge/qlge_dbg.c
index 47df304a02c8fb710c8d1688d9babaa508cf5200..e705ea5b975a0e52ed38a775b2840d27fd3890e5 100644 (file)
--- a/drivers/net/qlge/qlge_dbg.c
+++ b/drivers/net/qlge/qlge_dbg.c
@@ -455,10 +455,11 @@ void ql_dump_tx_ring(struct tx_ring *tx_ring)
        printk(KERN_ERR PFX "tx_ring->base = %p.\n", tx_ring->wq_base);
        printk(KERN_ERR PFX "tx_ring->base_dma = 0x%llx.\n",
               (unsigned long long) tx_ring->wq_base_dma);
-       printk(KERN_ERR PFX "tx_ring->cnsmr_idx_sh_reg = %p.\n",
-              tx_ring->cnsmr_idx_sh_reg);
-       printk(KERN_ERR PFX "tx_ring->cnsmr_idx_sh_reg_dma = 0x%llx.\n",
-              (unsigned long long) tx_ring->cnsmr_idx_sh_reg_dma);
+       printk(KERN_ERR PFX
+              "tx_ring->cnsmr_idx_sh_reg, addr = 0x%p, value = %d.\n",
+              tx_ring->cnsmr_idx_sh_reg,
+              tx_ring->cnsmr_idx_sh_reg
+                       ? ql_read_sh_reg(tx_ring->cnsmr_idx_sh_reg) : 0);
        printk(KERN_ERR PFX "tx_ring->size = %d.\n", tx_ring->wq_size);
        printk(KERN_ERR PFX "tx_ring->len = %d.\n", tx_ring->wq_len);
        printk(KERN_ERR PFX "tx_ring->prod_idx_db_reg = %p.\n",
@@ -558,9 +559,10 @@ void ql_dump_rx_ring(struct rx_ring *rx_ring)
        printk(KERN_ERR PFX "rx_ring->cq_size = %d.\n", rx_ring->cq_size);
        printk(KERN_ERR PFX "rx_ring->cq_len = %d.\n", rx_ring->cq_len);
        printk(KERN_ERR PFX
-              "rx_ring->prod_idx_sh_reg, addr = %p, value = %d.\n",
+              "rx_ring->prod_idx_sh_reg, addr = 0x%p, value = %d.\n",
               rx_ring->prod_idx_sh_reg,
-              rx_ring->prod_idx_sh_reg ? *(rx_ring->prod_idx_sh_reg) : 0);
+              rx_ring->prod_idx_sh_reg
+                       ? ql_read_sh_reg(rx_ring->prod_idx_sh_reg) : 0);
        printk(KERN_ERR PFX "rx_ring->prod_idx_sh_reg_dma = %llx.\n",
               (unsigned long long) rx_ring->prod_idx_sh_reg_dma);
        printk(KERN_ERR PFX "rx_ring->cnsmr_idx_db_reg = %p.\n",
@@ -821,14 +823,11 @@ void ql_dump_ib_mac_rsp(struct ib_mac_iocb_rsp *ib_mac_rsp)
                       le16_to_cpu(ib_mac_rsp->vlan_id));
 
        printk(KERN_ERR PFX "flags4 = %s%s%s.\n",
-              le32_to_cpu(ib_mac_rsp->
-                          flags4) & IB_MAC_IOCB_RSP_HV ? "HV " : "",
-              le32_to_cpu(ib_mac_rsp->
-                          flags4) & IB_MAC_IOCB_RSP_HS ? "HS " : "",
-              le32_to_cpu(ib_mac_rsp->
-                          flags4) & IB_MAC_IOCB_RSP_HL ? "HL " : "");
-
-       if (le32_to_cpu(ib_mac_rsp->flags4) & IB_MAC_IOCB_RSP_HV) {
+               ib_mac_rsp->flags4 & IB_MAC_IOCB_RSP_HV ? "HV " : "",
+               ib_mac_rsp->flags4 & IB_MAC_IOCB_RSP_HS ? "HS " : "",
+               ib_mac_rsp->flags4 & IB_MAC_IOCB_RSP_HL ? "HL " : "");
+
+       if (ib_mac_rsp->flags4 & IB_MAC_IOCB_RSP_HV) {
                printk(KERN_ERR PFX "hdr length = %d.\n",
                       le32_to_cpu(ib_mac_rsp->hdr_len));
                printk(KERN_ERR PFX "hdr addr_hi    = 0x%x.\n",