diff options
author | Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com> | 2014-05-27 07:45:49 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-05-29 13:10:31 -0400 |
commit | 39c52ee8cb6d473dda6c33431339ca2bc984d66d (patch) | |
tree | d34d927a01fb0f57b7a58836f0a024cbd61861a3 | |
parent | 047e5d74b6e97ef883f4c8e912bd89451957de2b (diff) |
wil6210: improve pointers printing
use proper format %pad for the dma_addr_t arguments;
prefix %p with 0x, as %p don't print is by itself
Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/ath/wil6210/debugfs.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/ath/wil6210/pcie_bus.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/wil6210/txrx.c | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/ath/wil6210/debugfs.c b/drivers/net/wireless/ath/wil6210/debugfs.c index ecdabe4adec3..8d4bc4bfb664 100644 --- a/drivers/net/wireless/ath/wil6210/debugfs.c +++ b/drivers/net/wireless/ath/wil6210/debugfs.c | |||
@@ -35,7 +35,7 @@ static void wil_print_vring(struct seq_file *s, struct wil6210_priv *wil, | |||
35 | void __iomem *x = wmi_addr(wil, vring->hwtail); | 35 | void __iomem *x = wmi_addr(wil, vring->hwtail); |
36 | 36 | ||
37 | seq_printf(s, "VRING %s = {\n", name); | 37 | seq_printf(s, "VRING %s = {\n", name); |
38 | seq_printf(s, " pa = 0x%016llx\n", (unsigned long long)vring->pa); | 38 | seq_printf(s, " pa = %pad\n", &vring->pa); |
39 | seq_printf(s, " va = 0x%p\n", vring->va); | 39 | seq_printf(s, " va = 0x%p\n", vring->va); |
40 | seq_printf(s, " size = %d\n", vring->size); | 40 | seq_printf(s, " size = %d\n", vring->size); |
41 | seq_printf(s, " swtail = %d\n", vring->swtail); | 41 | seq_printf(s, " swtail = %d\n", vring->swtail); |
@@ -473,7 +473,7 @@ static int wil_txdesc_debugfs_show(struct seq_file *s, void *data) | |||
473 | u[0], u[1], u[2], u[3]); | 473 | u[0], u[1], u[2], u[3]); |
474 | seq_printf(s, " DMA = 0x%08x 0x%08x 0x%08x 0x%08x\n", | 474 | seq_printf(s, " DMA = 0x%08x 0x%08x 0x%08x 0x%08x\n", |
475 | u[4], u[5], u[6], u[7]); | 475 | u[4], u[5], u[6], u[7]); |
476 | seq_printf(s, " SKB = %p\n", skb); | 476 | seq_printf(s, " SKB = 0x%p\n", skb); |
477 | 477 | ||
478 | if (skb) { | 478 | if (skb) { |
479 | skb_get(skb); | 479 | skb_get(skb); |
diff --git a/drivers/net/wireless/ath/wil6210/pcie_bus.c b/drivers/net/wireless/ath/wil6210/pcie_bus.c index 066088418307..1e2e07b9d13d 100644 --- a/drivers/net/wireless/ath/wil6210/pcie_bus.c +++ b/drivers/net/wireless/ath/wil6210/pcie_bus.c | |||
@@ -138,7 +138,7 @@ static int wil_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id) | |||
138 | goto err_release_reg; | 138 | goto err_release_reg; |
139 | } | 139 | } |
140 | /* rollback to err_iounmap */ | 140 | /* rollback to err_iounmap */ |
141 | dev_info(&pdev->dev, "CSR at %pR -> %p\n", &pdev->resource[0], csr); | 141 | dev_info(&pdev->dev, "CSR at %pR -> 0x%p\n", &pdev->resource[0], csr); |
142 | 142 | ||
143 | wil = wil_if_alloc(dev, csr); | 143 | wil = wil_if_alloc(dev, csr); |
144 | if (IS_ERR(wil)) { | 144 | if (IS_ERR(wil)) { |
diff --git a/drivers/net/wireless/ath/wil6210/txrx.c b/drivers/net/wireless/ath/wil6210/txrx.c index 82140e0e75d2..0784ef3d4ce2 100644 --- a/drivers/net/wireless/ath/wil6210/txrx.c +++ b/drivers/net/wireless/ath/wil6210/txrx.c | |||
@@ -114,8 +114,8 @@ static int wil_vring_alloc(struct wil6210_priv *wil, struct vring *vring) | |||
114 | _d->dma.status = TX_DMA_STATUS_DU; | 114 | _d->dma.status = TX_DMA_STATUS_DU; |
115 | } | 115 | } |
116 | 116 | ||
117 | wil_dbg_misc(wil, "vring[%d] 0x%p:0x%016llx 0x%p\n", vring->size, | 117 | wil_dbg_misc(wil, "vring[%d] 0x%p:%pad 0x%p\n", vring->size, |
118 | vring->va, (unsigned long long)vring->pa, vring->ctx); | 118 | vring->va, &vring->pa, vring->ctx); |
119 | 119 | ||
120 | return 0; | 120 | return 0; |
121 | } | 121 | } |
@@ -896,8 +896,8 @@ static int wil_tx_vring(struct wil6210_priv *wil, struct vring *vring, | |||
896 | pa = dma_map_single(dev, skb->data, | 896 | pa = dma_map_single(dev, skb->data, |
897 | skb_headlen(skb), DMA_TO_DEVICE); | 897 | skb_headlen(skb), DMA_TO_DEVICE); |
898 | 898 | ||
899 | wil_dbg_txrx(wil, "Tx skb %d bytes %p -> %#08llx\n", skb_headlen(skb), | 899 | wil_dbg_txrx(wil, "Tx skb %d bytes 0x%p -> %pad\n", skb_headlen(skb), |
900 | skb->data, (unsigned long long)pa); | 900 | skb->data, &pa); |
901 | wil_hex_dump_txrx("Tx ", DUMP_PREFIX_OFFSET, 16, 1, | 901 | wil_hex_dump_txrx("Tx ", DUMP_PREFIX_OFFSET, 16, 1, |
902 | skb->data, skb_headlen(skb), false); | 902 | skb->data, skb_headlen(skb), false); |
903 | 903 | ||