* [PATCH 1/1] staging: vme: fix address cast warnings for 64 bit architectures
@ 2011-11-02 15:47 Manohar Vanga
2011-11-02 15:51 ` Manohar Vanga
0 siblings, 1 reply; 3+ messages in thread
From: Manohar Vanga @ 2011-11-02 15:47 UTC (permalink / raw)
To: gregkh; +Cc: martyn.welch, cota, devel, linux-kernel, Manohar Vanga
Signed-off-by: Manohar Vanga <manohar.vanga@cern.ch>
---
drivers/staging/vme/bridges/vme_ca91cx42.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/vme/bridges/vme_ca91cx42.c b/drivers/staging/vme/bridges/vme_ca91cx42.c
index 0e4feac..b768563 100644
--- a/drivers/staging/vme/bridges/vme_ca91cx42.c
+++ b/drivers/staging/vme/bridges/vme_ca91cx42.c
@@ -876,13 +876,13 @@ static ssize_t ca91cx42_master_read(struct vme_master_resource *image,
* maximal configured data cycle is used and splits it
* automatically for non-aligned addresses.
*/
- if ((int)addr & 0x1) {
+ if ((uintptr_t)addr & 0x1) {
*(u8 *)buf = ioread8(addr);
done += 1;
if (done == count)
goto out;
}
- if ((int)addr & 0x2) {
+ if ((uintptr_t)addr & 0x2) {
if ((count - done) < 2) {
*(u8 *)(buf + done) = ioread8(addr + done);
done += 1;
@@ -930,13 +930,13 @@ static ssize_t ca91cx42_master_write(struct vme_master_resource *image,
/* Here we apply for the same strategy we do in master_read
* function in order to assure D16 cycle when required.
*/
- if ((int)addr & 0x1) {
+ if ((uintptr_t)addr & 0x1) {
iowrite8(*(u8 *)buf, addr);
done += 1;
if (done == count)
goto out;
}
- if ((int)addr & 0x2) {
+ if ((uintptr_t)addr & 0x2) {
if ((count - done) < 2) {
iowrite8(*(u8 *)(buf + done), addr + done);
done += 1;
@@ -990,7 +990,7 @@ static unsigned int ca91cx42_master_rmw(struct vme_master_resource *image,
/* Lock image */
spin_lock(&image->lock);
- pci_addr = (u32)image->kern_base + offset;
+ pci_addr = (uintptr_t)image->kern_base + offset;
/* Address must be 4-byte aligned */
if (pci_addr & 0x3) {
--
1.7.4.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 1/1] staging: vme: fix address cast warnings for 64 bit architectures
@ 2011-11-02 15:50 Manohar Vanga
0 siblings, 0 replies; 3+ messages in thread
From: Manohar Vanga @ 2011-11-02 15:50 UTC (permalink / raw)
To: gregkh; +Cc: martyn.welch, cota, devel, linux-kernel, Manohar Vanga
Signed-off-by: Manohar Vanga <manohar.vanga@cern.ch>
---
drivers/staging/vme/bridges/vme_ca91cx42.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/vme/bridges/vme_ca91cx42.c b/drivers/staging/vme/bridges/vme_ca91cx42.c
index 0e4feac..f563a00 100644
--- a/drivers/staging/vme/bridges/vme_ca91cx42.c
+++ b/drivers/staging/vme/bridges/vme_ca91cx42.c
@@ -876,13 +876,13 @@ static ssize_t ca91cx42_master_read(struct vme_master_resource *image,
* maximal configured data cycle is used and splits it
* automatically for non-aligned addresses.
*/
- if ((int)addr & 0x1) {
+ if ((uintptr_t)addr & 0x1) {
*(u8 *)buf = ioread8(addr);
done += 1;
if (done == count)
goto out;
}
- if ((int)addr & 0x2) {
+ if ((uintptr_t)addr & 0x2) {
if ((count - done) < 2) {
*(u8 *)(buf + done) = ioread8(addr + done);
done += 1;
@@ -930,13 +930,13 @@ static ssize_t ca91cx42_master_write(struct vme_master_resource *image,
/* Here we apply for the same strategy we do in master_read
* function in order to assure D16 cycle when required.
*/
- if ((int)addr & 0x1) {
+ if ((uintptr_t)addr & 0x1) {
iowrite8(*(u8 *)buf, addr);
done += 1;
if (done == count)
goto out;
}
- if ((int)addr & 0x2) {
+ if ((uintptr_t)addr & 0x2) {
if ((count - done) < 2) {
iowrite8(*(u8 *)(buf + done), addr + done);
done += 1;
@@ -973,7 +973,8 @@ static unsigned int ca91cx42_master_rmw(struct vme_master_resource *image,
unsigned int mask, unsigned int compare, unsigned int swap,
loff_t offset)
{
- u32 pci_addr, result;
+ u32 result;
+ uintptr_t pci_addr;
int i;
struct ca91cx42_driver *bridge;
struct device *dev;
@@ -990,7 +991,7 @@ static unsigned int ca91cx42_master_rmw(struct vme_master_resource *image,
/* Lock image */
spin_lock(&image->lock);
- pci_addr = (u32)image->kern_base + offset;
+ pci_addr = (uintptr_t)image->kern_base + offset;
/* Address must be 4-byte aligned */
if (pci_addr & 0x3) {
--
1.7.4.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] staging: vme: fix address cast warnings for 64 bit architectures
2011-11-02 15:47 [PATCH 1/1] staging: vme: fix address cast warnings for 64 bit architectures Manohar Vanga
@ 2011-11-02 15:51 ` Manohar Vanga
0 siblings, 0 replies; 3+ messages in thread
From: Manohar Vanga @ 2011-11-02 15:51 UTC (permalink / raw)
To: gregkh; +Cc: martyn.welch, cota, devel, linux-kernel
Hi,
Please ignore this patch and look at the newer one.
Thanks
On Wed, Nov 02, 2011 at 04:47:06PM +0100, Manohar Vanga wrote:
> Signed-off-by: Manohar Vanga <manohar.vanga@cern.ch>
> ---
> drivers/staging/vme/bridges/vme_ca91cx42.c | 10 +++++-----
> 1 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/staging/vme/bridges/vme_ca91cx42.c b/drivers/staging/vme/bridges/vme_ca91cx42.c
> index 0e4feac..b768563 100644
> --- a/drivers/staging/vme/bridges/vme_ca91cx42.c
> +++ b/drivers/staging/vme/bridges/vme_ca91cx42.c
> @@ -876,13 +876,13 @@ static ssize_t ca91cx42_master_read(struct vme_master_resource *image,
> * maximal configured data cycle is used and splits it
> * automatically for non-aligned addresses.
> */
> - if ((int)addr & 0x1) {
> + if ((uintptr_t)addr & 0x1) {
> *(u8 *)buf = ioread8(addr);
> done += 1;
> if (done == count)
> goto out;
> }
> - if ((int)addr & 0x2) {
> + if ((uintptr_t)addr & 0x2) {
> if ((count - done) < 2) {
> *(u8 *)(buf + done) = ioread8(addr + done);
> done += 1;
> @@ -930,13 +930,13 @@ static ssize_t ca91cx42_master_write(struct vme_master_resource *image,
> /* Here we apply for the same strategy we do in master_read
> * function in order to assure D16 cycle when required.
> */
> - if ((int)addr & 0x1) {
> + if ((uintptr_t)addr & 0x1) {
> iowrite8(*(u8 *)buf, addr);
> done += 1;
> if (done == count)
> goto out;
> }
> - if ((int)addr & 0x2) {
> + if ((uintptr_t)addr & 0x2) {
> if ((count - done) < 2) {
> iowrite8(*(u8 *)(buf + done), addr + done);
> done += 1;
> @@ -990,7 +990,7 @@ static unsigned int ca91cx42_master_rmw(struct vme_master_resource *image,
> /* Lock image */
> spin_lock(&image->lock);
>
> - pci_addr = (u32)image->kern_base + offset;
> + pci_addr = (uintptr_t)image->kern_base + offset;
>
> /* Address must be 4-byte aligned */
> if (pci_addr & 0x3) {
> --
> 1.7.4.1
>
--
/manohar
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-11-02 15:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-02 15:47 [PATCH 1/1] staging: vme: fix address cast warnings for 64 bit architectures Manohar Vanga
2011-11-02 15:51 ` Manohar Vanga
-- strict thread matches above, loose matches on Subject: below --
2011-11-02 15:50 Manohar Vanga
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox