aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2016-12-21 11:03:23 -0500
committerDavid S. Miller <davem@davemloft.net>2016-12-21 15:34:51 -0500
commit551cde192343a10c8fbd57c4cc8f0c4b6cd307e4 (patch)
treecb5bbaf8660bbc58dfc38389cce30c7ff70dc5c5
parent0a9648f1293966c838dc570da73c15a76f4c89d6 (diff)
net: fddi: skfp: use %p format specifier for addresses rather than %x
Trivial fix: Addresses should be printed using the %p format specifier rather than using %x. Signed-off-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/fddi/skfp/hwmtm.c12
-rw-r--r--drivers/net/fddi/skfp/pmf.c2
-rw-r--r--drivers/net/fddi/skfp/smt.c2
3 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/fddi/skfp/hwmtm.c b/drivers/net/fddi/skfp/hwmtm.c
index e26398b5a7dc..d0a68bdd5f63 100644
--- a/drivers/net/fddi/skfp/hwmtm.c
+++ b/drivers/net/fddi/skfp/hwmtm.c
@@ -1483,7 +1483,7 @@ void mac_drv_clear_rx_queue(struct s_smc *smc)
1483 r = queue->rx_curr_get ; 1483 r = queue->rx_curr_get ;
1484 while (queue->rx_used) { 1484 while (queue->rx_used) {
1485 DRV_BUF_FLUSH(r,DDI_DMA_SYNC_FORCPU) ; 1485 DRV_BUF_FLUSH(r,DDI_DMA_SYNC_FORCPU) ;
1486 DB_RX("switch OWN bit of RxD 0x%x ",r,0,5) ; 1486 DB_RX("switch OWN bit of RxD 0x%p ",r,0,5) ;
1487 r->rxd_rbctrl &= ~cpu_to_le32(BMU_OWN) ; 1487 r->rxd_rbctrl &= ~cpu_to_le32(BMU_OWN) ;
1488 frag_count = 1 ; 1488 frag_count = 1 ;
1489 DRV_BUF_FLUSH(r,DDI_DMA_SYNC_FORDEV) ; 1489 DRV_BUF_FLUSH(r,DDI_DMA_SYNC_FORDEV) ;
@@ -1645,7 +1645,7 @@ void hwm_tx_frag(struct s_smc *smc, char far *virt, u_long phys, int len,
1645 DB_TX("hwm_tx_frag: len = %d, frame_status = %x ",len,frame_status,2) ; 1645 DB_TX("hwm_tx_frag: len = %d, frame_status = %x ",len,frame_status,2) ;
1646 if (frame_status & LAN_TX) { 1646 if (frame_status & LAN_TX) {
1647 /* '*t' is already defined */ 1647 /* '*t' is already defined */
1648 DB_TX("LAN_TX: TxD = %x, virt = %x ",t,virt,3) ; 1648 DB_TX("LAN_TX: TxD = %p, virt = %p ",t,virt,3) ;
1649 t->txd_virt = virt ; 1649 t->txd_virt = virt ;
1650 t->txd_txdscr = cpu_to_le32(smc->os.hwm.tx_descr) ; 1650 t->txd_txdscr = cpu_to_le32(smc->os.hwm.tx_descr) ;
1651 t->txd_tbadr = cpu_to_le32(phys) ; 1651 t->txd_tbadr = cpu_to_le32(phys) ;
@@ -1819,7 +1819,7 @@ void smt_send_mbuf(struct s_smc *smc, SMbuf *mb, int fc)
1819 __le32 tbctrl; 1819 __le32 tbctrl;
1820 1820
1821 NDD_TRACE("THSB",mb,fc,0) ; 1821 NDD_TRACE("THSB",mb,fc,0) ;
1822 DB_TX("smt_send_mbuf: mb = 0x%x, fc = 0x%x",mb,fc,4) ; 1822 DB_TX("smt_send_mbuf: mb = 0x%p, fc = 0x%x",mb,fc,4) ;
1823 1823
1824 mb->sm_off-- ; /* set to fc */ 1824 mb->sm_off-- ; /* set to fc */
1825 mb->sm_len++ ; /* + fc */ 1825 mb->sm_len++ ; /* + fc */
@@ -1960,7 +1960,7 @@ static void mac_drv_clear_txd(struct s_smc *smc)
1960 1960
1961 do { 1961 do {
1962 DRV_BUF_FLUSH(t1,DDI_DMA_SYNC_FORCPU) ; 1962 DRV_BUF_FLUSH(t1,DDI_DMA_SYNC_FORCPU) ;
1963 DB_TX("check OWN/EOF bit of TxD 0x%x",t1,0,5) ; 1963 DB_TX("check OWN/EOF bit of TxD 0x%p",t1,0,5) ;
1964 tbctrl = le32_to_cpu(CR_READ(t1->txd_tbctrl)); 1964 tbctrl = le32_to_cpu(CR_READ(t1->txd_tbctrl));
1965 1965
1966 if (tbctrl & BMU_OWN || !queue->tx_used){ 1966 if (tbctrl & BMU_OWN || !queue->tx_used){
@@ -1988,7 +1988,7 @@ static void mac_drv_clear_txd(struct s_smc *smc)
1988 } 1988 }
1989 else { 1989 else {
1990#ifndef PASS_1ST_TXD_2_TX_COMP 1990#ifndef PASS_1ST_TXD_2_TX_COMP
1991 DB_TX("mac_drv_tx_comp for TxD 0x%x",t2,0,4) ; 1991 DB_TX("mac_drv_tx_comp for TxD 0x%p",t2,0,4) ;
1992 mac_drv_tx_complete(smc,t2) ; 1992 mac_drv_tx_complete(smc,t2) ;
1993#else 1993#else
1994 DB_TX("mac_drv_tx_comp for TxD 0x%x", 1994 DB_TX("mac_drv_tx_comp for TxD 0x%x",
@@ -2052,7 +2052,7 @@ void mac_drv_clear_tx_queue(struct s_smc *smc)
2052 tx_used = queue->tx_used ; 2052 tx_used = queue->tx_used ;
2053 while (tx_used) { 2053 while (tx_used) {
2054 DRV_BUF_FLUSH(t,DDI_DMA_SYNC_FORCPU) ; 2054 DRV_BUF_FLUSH(t,DDI_DMA_SYNC_FORCPU) ;
2055 DB_TX("switch OWN bit of TxD 0x%x ",t,0,5) ; 2055 DB_TX("switch OWN bit of TxD 0x%p ",t,0,5) ;
2056 t->txd_tbctrl &= ~cpu_to_le32(BMU_OWN) ; 2056 t->txd_tbctrl &= ~cpu_to_le32(BMU_OWN) ;
2057 DRV_BUF_FLUSH(t,DDI_DMA_SYNC_FORDEV) ; 2057 DRV_BUF_FLUSH(t,DDI_DMA_SYNC_FORDEV) ;
2058 t = t->txd_next ; 2058 t = t->txd_next ;
diff --git a/drivers/net/fddi/skfp/pmf.c b/drivers/net/fddi/skfp/pmf.c
index 441b4dc79450..52fa162a31e0 100644
--- a/drivers/net/fddi/skfp/pmf.c
+++ b/drivers/net/fddi/skfp/pmf.c
@@ -284,7 +284,7 @@ void smt_pmf_received_pack(struct s_smc *smc, SMbuf *mb, int local)
284 SMbuf *reply ; 284 SMbuf *reply ;
285 285
286 sm = smtod(mb,struct smt_header *) ; 286 sm = smtod(mb,struct smt_header *) ;
287 DB_SMT("SMT: processing PMF frame at %x len %d\n",sm,mb->sm_len) ; 287 DB_SMT("SMT: processing PMF frame at %p len %d\n",sm,mb->sm_len) ;
288#ifdef DEBUG 288#ifdef DEBUG
289 dump_smt(smc,sm,"PMF Received") ; 289 dump_smt(smc,sm,"PMF Received") ;
290#endif 290#endif
diff --git a/drivers/net/fddi/skfp/smt.c b/drivers/net/fddi/skfp/smt.c
index cd78b7cacc75..e80a08903fcf 100644
--- a/drivers/net/fddi/skfp/smt.c
+++ b/drivers/net/fddi/skfp/smt.c
@@ -504,7 +504,7 @@ void smt_received_pack(struct s_smc *smc, SMbuf *mb, int fs)
504#endif 504#endif
505 505
506 smt_swap_para(sm,(int) mb->sm_len,1) ; 506 smt_swap_para(sm,(int) mb->sm_len,1) ;
507 DB_SMT("SMT : received packet [%s] at 0x%x\n", 507 DB_SMT("SMT : received packet [%s] at 0x%p\n",
508 smt_type_name[m_fc(mb) & 0xf],sm) ; 508 smt_type_name[m_fc(mb) & 0xf],sm) ;
509 DB_SMT("SMT : version %d, class %s\n",sm->smt_version, 509 DB_SMT("SMT : version %d, class %s\n",sm->smt_version,
510 smt_class_name[(sm->smt_class>LAST_CLASS)?0 : sm->smt_class]) ; 510 smt_class_name[(sm->smt_class>LAST_CLASS)?0 : sm->smt_class]) ;