diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2008-05-16 16:17:06 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-05-22 05:59:29 -0400 |
commit | 086ea3564a5378a06c7cbfaf9d2727bc58a8c285 (patch) | |
tree | 5dab0ca0a90370cb9eb22d5d5f5ecfa3bbf0a73d /drivers/net/sfc/efx.c | |
parent | 184be0c21aba048cf510036edeee095e68740951 (diff) |
sfc: Use resource_size_t for PCI bus address
This should make the driver work on 32-bit systems with 64-bit PCI support.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/sfc/efx.c')
-rw-r--r-- | drivers/net/sfc/efx.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c index 86d40295a777..f6131e578b44 100644 --- a/drivers/net/sfc/efx.c +++ b/drivers/net/sfc/efx.c | |||
@@ -778,15 +778,16 @@ static int efx_init_io(struct efx_nic *efx) | |||
778 | efx->membase = ioremap_nocache(efx->membase_phys, | 778 | efx->membase = ioremap_nocache(efx->membase_phys, |
779 | efx->type->mem_map_size); | 779 | efx->type->mem_map_size); |
780 | if (!efx->membase) { | 780 | if (!efx->membase) { |
781 | EFX_ERR(efx, "could not map memory BAR %d at %lx+%x\n", | 781 | EFX_ERR(efx, "could not map memory BAR %d at %llx+%x\n", |
782 | efx->type->mem_bar, efx->membase_phys, | 782 | efx->type->mem_bar, |
783 | (unsigned long long)efx->membase_phys, | ||
783 | efx->type->mem_map_size); | 784 | efx->type->mem_map_size); |
784 | rc = -ENOMEM; | 785 | rc = -ENOMEM; |
785 | goto fail4; | 786 | goto fail4; |
786 | } | 787 | } |
787 | EFX_LOG(efx, "memory BAR %u at %lx+%x (virtual %p)\n", | 788 | EFX_LOG(efx, "memory BAR %u at %llx+%x (virtual %p)\n", |
788 | efx->type->mem_bar, efx->membase_phys, efx->type->mem_map_size, | 789 | efx->type->mem_bar, (unsigned long long)efx->membase_phys, |
789 | efx->membase); | 790 | efx->type->mem_map_size, efx->membase); |
790 | 791 | ||
791 | return 0; | 792 | return 0; |
792 | 793 | ||