2008-08-05 20:06:57

by Alexander Beregalov

[permalink] [raw]
Subject: [PATCH] netxen_nic_hw.c: fix warnings

From: Alexander Beregalov <[email protected]>

netxen_nic_hw.c: fix warnings

drivers/net/netxen/netxen_nic_hw.c:1414: warning: format '%llx' expects type 'long long unsigned int', but argument 3 has type 'u64'
drivers/net/netxen/netxen_nic_hw.c:1487: warning: format '%llx' expects type 'long long unsigned int', but argument 3 has type 'u64'


Signed-off-by: Alexander Beregalov <[email protected]>
---

drivers/net/netxen/netxen_nic_hw.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index 96a3bc6..06a517b 100644
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
@@ -1411,7 +1411,8 @@ static int netxen_nic_pci_mem_read_direct(struct netxen_adapter *adapter,
(netxen_nic_pci_is_same_window(adapter, off+size-1) == 0)) {
write_unlock_irqrestore(&adapter->adapter_lock, flags);
printk(KERN_ERR "%s out of bound pci memory access. "
- "offset is 0x%llx\n", netxen_nic_driver_name, off);
+ "offset is 0x%llx\n", netxen_nic_driver_name,
+ (unsigned long long)off);
return -1;
}

@@ -1484,7 +1485,8 @@ netxen_nic_pci_mem_write_direct(struct netxen_adapter *adapter, u64 off,
(netxen_nic_pci_is_same_window(adapter, off+size-1) == 0)) {
write_unlock_irqrestore(&adapter->adapter_lock, flags);
printk(KERN_ERR "%s out of bound pci memory access. "
- "offset is 0x%llx\n", netxen_nic_driver_name, off);
+ "offset is 0x%llx\n", netxen_nic_driver_name,
+ (unsigned long long)off);
return -1;
}


2008-08-06 02:21:48

by Simon Horman

[permalink] [raw]
Subject: Re: [PATCH] netxen_nic_hw.c: fix warnings

On Wed, Aug 06, 2008 at 12:05:16AM +0400, Alexander Beregalov wrote:
> From: Alexander Beregalov <[email protected]>
>
> netxen_nic_hw.c: fix warnings
>
> drivers/net/netxen/netxen_nic_hw.c:1414: warning: format '%llx' expects type 'long long unsigned int', but argument 3 has type 'u64'
> drivers/net/netxen/netxen_nic_hw.c:1487: warning: format '%llx' expects type 'long long unsigned int', but argument 3 has type 'u64'

This seems to be the agreed work-around for this.

Acked-by: Simon Horman <[email protected]>

> Signed-off-by: Alexander Beregalov <[email protected]>
> ---
>
> drivers/net/netxen/netxen_nic_hw.c | 6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
> index 96a3bc6..06a517b 100644
> --- a/drivers/net/netxen/netxen_nic_hw.c
> +++ b/drivers/net/netxen/netxen_nic_hw.c
> @@ -1411,7 +1411,8 @@ static int netxen_nic_pci_mem_read_direct(struct netxen_adapter *adapter,
> (netxen_nic_pci_is_same_window(adapter, off+size-1) == 0)) {
> write_unlock_irqrestore(&adapter->adapter_lock, flags);
> printk(KERN_ERR "%s out of bound pci memory access. "
> - "offset is 0x%llx\n", netxen_nic_driver_name, off);
> + "offset is 0x%llx\n", netxen_nic_driver_name,
> + (unsigned long long)off);
> return -1;
> }
>
> @@ -1484,7 +1485,8 @@ netxen_nic_pci_mem_write_direct(struct netxen_adapter *adapter, u64 off,
> (netxen_nic_pci_is_same_window(adapter, off+size-1) == 0)) {
> write_unlock_irqrestore(&adapter->adapter_lock, flags);
> printk(KERN_ERR "%s out of bound pci memory access. "
> - "offset is 0x%llx\n", netxen_nic_driver_name, off);
> + "offset is 0x%llx\n", netxen_nic_driver_name,
> + (unsigned long long)off);
> return -1;
> }
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html