diff options
Diffstat (limited to 'drivers/net/sfc/falcon.c')
-rw-r--r-- | drivers/net/sfc/falcon.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c index 23a1b148d5b2..d4629ab2c614 100644 --- a/drivers/net/sfc/falcon.c +++ b/drivers/net/sfc/falcon.c | |||
@@ -340,10 +340,10 @@ static int falcon_alloc_special_buffer(struct efx_nic *efx, | |||
340 | nic_data->next_buffer_table += buffer->entries; | 340 | nic_data->next_buffer_table += buffer->entries; |
341 | 341 | ||
342 | EFX_LOG(efx, "allocating special buffers %d-%d at %llx+%x " | 342 | EFX_LOG(efx, "allocating special buffers %d-%d at %llx+%x " |
343 | "(virt %p phys %lx)\n", buffer->index, | 343 | "(virt %p phys %llx)\n", buffer->index, |
344 | buffer->index + buffer->entries - 1, | 344 | buffer->index + buffer->entries - 1, |
345 | (unsigned long long)buffer->dma_addr, len, | 345 | (u64)buffer->dma_addr, len, |
346 | buffer->addr, virt_to_phys(buffer->addr)); | 346 | buffer->addr, (u64)virt_to_phys(buffer->addr)); |
347 | 347 | ||
348 | return 0; | 348 | return 0; |
349 | } | 349 | } |
@@ -355,10 +355,10 @@ static void falcon_free_special_buffer(struct efx_nic *efx, | |||
355 | return; | 355 | return; |
356 | 356 | ||
357 | EFX_LOG(efx, "deallocating special buffers %d-%d at %llx+%x " | 357 | EFX_LOG(efx, "deallocating special buffers %d-%d at %llx+%x " |
358 | "(virt %p phys %lx)\n", buffer->index, | 358 | "(virt %p phys %llx)\n", buffer->index, |
359 | buffer->index + buffer->entries - 1, | 359 | buffer->index + buffer->entries - 1, |
360 | (unsigned long long)buffer->dma_addr, buffer->len, | 360 | (u64)buffer->dma_addr, buffer->len, |
361 | buffer->addr, virt_to_phys(buffer->addr)); | 361 | buffer->addr, (u64)virt_to_phys(buffer->addr)); |
362 | 362 | ||
363 | pci_free_consistent(efx->pci_dev, buffer->len, buffer->addr, | 363 | pci_free_consistent(efx->pci_dev, buffer->len, buffer->addr, |
364 | buffer->dma_addr); | 364 | buffer->dma_addr); |
@@ -2357,10 +2357,10 @@ int falcon_probe_port(struct efx_nic *efx) | |||
2357 | FALCON_MAC_STATS_SIZE); | 2357 | FALCON_MAC_STATS_SIZE); |
2358 | if (rc) | 2358 | if (rc) |
2359 | return rc; | 2359 | return rc; |
2360 | EFX_LOG(efx, "stats buffer at %llx (virt %p phys %lx)\n", | 2360 | EFX_LOG(efx, "stats buffer at %llx (virt %p phys %llx)\n", |
2361 | (unsigned long long)efx->stats_buffer.dma_addr, | 2361 | (u64)efx->stats_buffer.dma_addr, |
2362 | efx->stats_buffer.addr, | 2362 | efx->stats_buffer.addr, |
2363 | virt_to_phys(efx->stats_buffer.addr)); | 2363 | (u64)virt_to_phys(efx->stats_buffer.addr)); |
2364 | 2364 | ||
2365 | return 0; | 2365 | return 0; |
2366 | } | 2366 | } |
@@ -2935,9 +2935,9 @@ int falcon_probe_nic(struct efx_nic *efx) | |||
2935 | goto fail4; | 2935 | goto fail4; |
2936 | BUG_ON(efx->irq_status.dma_addr & 0x0f); | 2936 | BUG_ON(efx->irq_status.dma_addr & 0x0f); |
2937 | 2937 | ||
2938 | EFX_LOG(efx, "INT_KER at %llx (virt %p phys %lx)\n", | 2938 | EFX_LOG(efx, "INT_KER at %llx (virt %p phys %llx)\n", |
2939 | (unsigned long long)efx->irq_status.dma_addr, | 2939 | (u64)efx->irq_status.dma_addr, |
2940 | efx->irq_status.addr, virt_to_phys(efx->irq_status.addr)); | 2940 | efx->irq_status.addr, (u64)virt_to_phys(efx->irq_status.addr)); |
2941 | 2941 | ||
2942 | falcon_probe_spi_devices(efx); | 2942 | falcon_probe_spi_devices(efx); |
2943 | 2943 | ||