AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

powerpc: Cleanup from l64 to ll64 change: drivers/net

Browse Source 
These are powerpc specific drivers.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Stephen Rothwell 2009-01-06 14:40:06 +00:00 committed by Benjamin Herrenschmidt
parent 1901515c79
commit a1c5a8932b
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ehea/ehea_main.c
View File

@ -132,7 +132,7 @@ void ehea_dump(void *adr, int len, char *msg)
int x; int x;
unsigned char *deb = adr; unsigned char *deb = adr;
for (x = 0; x < len; x += 16) { for (x = 0; x < len; x += 16) {
printk(DRV_NAME " %s adr=%p ofs=%04x %016lx %016lx\n", msg, printk(DRV_NAME " %s adr=%p ofs=%04x %016llx %016llx\n", msg,
deb, x, *((u64 *)&deb[0]), *((u64 *)&deb[8])); deb, x, *((u64 *)&deb[0]), *((u64 *)&deb[8]));
deb += 16; deb += 16;
} }
@ -883,7 +883,7 @@ static irqreturn_t ehea_qp_aff_irq_handler(int irq, void *param)
while (eqe) { while (eqe) {
qp_token = EHEA_BMASK_GET(EHEA_EQE_QP_TOKEN, eqe->entry); qp_token = EHEA_BMASK_GET(EHEA_EQE_QP_TOKEN, eqe->entry);
ehea_error("QP aff_err: entry=0x%lx, token=0x%x", ehea_error("QP aff_err: entry=0x%llx, token=0x%x",
eqe->entry, qp_token); eqe->entry, qp_token);
qp = port->port_res[qp_token].qp; qp = port->port_res[qp_token].qp;
@ -1159,7 +1159,7 @@ static void ehea_parse_eqe(struct ehea_adapter *adapter, u64 eqe)
netif_stop_queue(port->netdev); netif_stop_queue(port->netdev);
break; break;
default: default:
ehea_error("unknown event code %x, eqe=0x%lX", ec, eqe); ehea_error("unknown event code %x, eqe=0x%llX", ec, eqe);
break; break;
} }
} }
@ -1971,7 +1971,7 @@ static void ehea_set_multicast_list(struct net_device *dev)
} }
if (dev->mc_count > port->adapter->max_mc_mac) { if (dev->mc_count > port->adapter->max_mc_mac) {
ehea_info("Mcast registration limit reached (0x%lx). " ehea_info("Mcast registration limit reached (0x%llx). "
"Use ALLMULTI!", "Use ALLMULTI!",
port->adapter->max_mc_mac); port->adapter->max_mc_mac);
goto out; goto out;

18
drivers/net/ehea/ehea_qmr.c
View File

@ -168,7 +168,7 @@ struct ehea_cq *ehea_create_cq(struct ehea_adapter *adapter,
cq->fw_handle, rpage, 1); cq->fw_handle, rpage, 1);
if (hret < H_SUCCESS) { if (hret < H_SUCCESS) {
ehea_error("register_rpage_cq failed ehea_cq=%p " ehea_error("register_rpage_cq failed ehea_cq=%p "
"hret=%lx counter=%i act_pages=%i", "hret=%llx counter=%i act_pages=%i",
cq, hret, counter, cq->attr.nr_pages); cq, hret, counter, cq->attr.nr_pages);
goto out_kill_hwq; goto out_kill_hwq;
} }
@ -178,13 +178,13 @@ struct ehea_cq *ehea_create_cq(struct ehea_adapter *adapter,
if ((hret != H_SUCCESS) || (vpage)) { if ((hret != H_SUCCESS) || (vpage)) {
ehea_error("registration of pages not " ehea_error("registration of pages not "
"complete hret=%lx\n", hret); "complete hret=%llx\n", hret);
goto out_kill_hwq; goto out_kill_hwq;
} }
} else { } else {
if (hret != H_PAGE_REGISTERED) { if (hret != H_PAGE_REGISTERED) {
ehea_error("CQ: registration of page failed " ehea_error("CQ: registration of page failed "
"hret=%lx\n", hret); "hret=%llx\n", hret);
goto out_kill_hwq; goto out_kill_hwq;
} }
} }
@ -986,15 +986,15 @@ void print_error_data(u64 *data)
length = EHEA_PAGESIZE; length = EHEA_PAGESIZE;
if (type == 0x8) /* Queue Pair */ if (type == 0x8) /* Queue Pair */
ehea_error("QP (resource=%lX) state: AER=0x%lX, AERR=0x%lX, " ehea_error("QP (resource=%llX) state: AER=0x%llX, AERR=0x%llX, "
"port=%lX", resource, data[6], data[12], data[22]); "port=%llX", resource, data[6], data[12], data[22]);
if (type == 0x4) /* Completion Queue */ if (type == 0x4) /* Completion Queue */
ehea_error("CQ (resource=%lX) state: AER=0x%lX", resource, ehea_error("CQ (resource=%llX) state: AER=0x%llX", resource,
data[6]); data[6]);
if (type == 0x3) /* Event Queue */ if (type == 0x3) /* Event Queue */
ehea_error("EQ (resource=%lX) state: AER=0x%lX", resource, ehea_error("EQ (resource=%llX) state: AER=0x%llX", resource,
data[6]); data[6]);
ehea_dump(data, length, "error data"); ehea_dump(data, length, "error data");
@ -1016,11 +1016,11 @@ void ehea_error_data(struct ehea_adapter *adapter, u64 res_handle)
rblock); rblock);
if (ret == H_R_STATE) if (ret == H_R_STATE)
ehea_error("No error data is available: %lX.", res_handle); ehea_error("No error data is available: %llX.", res_handle);
else if (ret == H_SUCCESS) else if (ret == H_SUCCESS)
print_error_data(rblock); print_error_data(rblock);
else else
ehea_error("Error data could not be fetched: %lX", res_handle); ehea_error("Error data could not be fetched: %llX", res_handle);
kfree(rblock); kfree(rblock);
} }

16
drivers/net/ibmveth.c
View File

@ -602,7 +602,7 @@ static int ibmveth_open(struct net_device *netdev)
if(lpar_rc != H_SUCCESS) { if(lpar_rc != H_SUCCESS) {
ibmveth_error_printk("h_register_logical_lan failed with %ld\n", lpar_rc); ibmveth_error_printk("h_register_logical_lan failed with %ld\n", lpar_rc);
ibmveth_error_printk("buffer TCE:0x%lx filter TCE:0x%lx rxq desc:0x%lx MAC:0x%lx\n", ibmveth_error_printk("buffer TCE:0x%llx filter TCE:0x%llx rxq desc:0x%llx MAC:0x%llx\n",
adapter->buffer_list_dma, adapter->buffer_list_dma,
adapter->filter_list_dma, adapter->filter_list_dma,
rxq_desc.desc, rxq_desc.desc,
@ -1378,13 +1378,13 @@ static int ibmveth_show(struct seq_file *seq, void *v)
seq_printf(seq, "Firmware MAC: %pM\n", firmware_mac); seq_printf(seq, "Firmware MAC: %pM\n", firmware_mac);
seq_printf(seq, "\nAdapter Statistics:\n"); seq_printf(seq, "\nAdapter Statistics:\n");
seq_printf(seq, " TX: vio_map_single failres: %ld\n", adapter->tx_map_failed); seq_printf(seq, " TX: vio_map_single failres: %lld\n", adapter->tx_map_failed);
seq_printf(seq, " send failures: %ld\n", adapter->tx_send_failed); seq_printf(seq, " send failures: %lld\n", adapter->tx_send_failed);
seq_printf(seq, " RX: replenish task cycles: %ld\n", adapter->replenish_task_cycles); seq_printf(seq, " RX: replenish task cycles: %lld\n", adapter->replenish_task_cycles);
seq_printf(seq, " alloc_skb_failures: %ld\n", adapter->replenish_no_mem); seq_printf(seq, " alloc_skb_failures: %lld\n", adapter->replenish_no_mem);
seq_printf(seq, " add buffer failures: %ld\n", adapter->replenish_add_buff_failure); seq_printf(seq, " add buffer failures: %lld\n", adapter->replenish_add_buff_failure);
seq_printf(seq, " invalid buffers: %ld\n", adapter->rx_invalid_buffer); seq_printf(seq, " invalid buffers: %lld\n", adapter->rx_invalid_buffer);
seq_printf(seq, " no buffers: %ld\n", adapter->rx_no_buffer); seq_printf(seq, " no buffers: %lld\n", adapter->rx_no_buffer);
return 0; return 0;
} }

2
drivers/net/iseries_veth.c
View File

@ -429,7 +429,7 @@ SIMPLE_PORT_ATTR(promiscuous);
SIMPLE_PORT_ATTR(num_mcast); SIMPLE_PORT_ATTR(num_mcast);
CUSTOM_PORT_ATTR(lpar_map, "0x%X\n", port->lpar_map); CUSTOM_PORT_ATTR(lpar_map, "0x%X\n", port->lpar_map);
CUSTOM_PORT_ATTR(stopped_map, "0x%X\n", port->stopped_map); CUSTOM_PORT_ATTR(stopped_map, "0x%X\n", port->stopped_map);
CUSTOM_PORT_ATTR(mac_addr, "0x%lX\n", port->mac_addr); CUSTOM_PORT_ATTR(mac_addr, "0x%llX\n", port->mac_addr);
#define GET_PORT_ATTR(_name) (&veth_port_attr_##_name.attr) #define GET_PORT_ATTR(_name) (&veth_port_attr_##_name.attr)
static struct attribute *veth_port_default_attrs[] = { static struct attribute *veth_port_default_attrs[] = {