The gcc complains about the cast pointer to int on 64-bit as follows. Use unsigned long instead and wrap it up in new macro.
CC [M] drivers/staging/vme/bridges/vme_ca91cx42.o drivers/staging/vme/bridges/vme_ca91cx42.c: In function ‘ca91cx42_master_read’: drivers/staging/vme/bridges/vme_ca91cx42.c:870: warning: cast from pointer to integer of different size drivers/staging/vme/bridges/vme_ca91cx42.c:876: warning: cast from pointer to integer of different size drivers/staging/vme/bridges/vme_ca91cx42.c: In function ‘ca91cx42_master_write’: drivers/staging/vme/bridges/vme_ca91cx42.c:924: warning: cast from pointer to integer of different size drivers/staging/vme/bridges/vme_ca91cx42.c:930: warning: cast from pointer to integer of different size drivers/staging/vme/bridges/vme_ca91cx42.c: In function ‘ca91cx42_master_rmw’: drivers/staging/vme/bridges/vme_ca91cx42.c:983: warning: cast from pointer to integer of different size Signed-off-by: Namhyung Kim <[email protected]> --- I'm not sure about the name. Suggestions? drivers/staging/vme/bridges/vme_ca91cx42.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/staging/vme/bridges/vme_ca91cx42.c b/drivers/staging/vme/bridges/vme_ca91cx42.c index d1df7d12f504..cb72a5d1eeca 100644 --- a/drivers/staging/vme/bridges/vme_ca91cx42.c +++ b/drivers/staging/vme/bridges/vme_ca91cx42.c @@ -845,6 +845,8 @@ int ca91cx42_master_get(struct vme_master_resource *image, int *enabled, return retval; } +#define check_aligned(addr, align) ((unsigned long)addr & align) + ssize_t ca91cx42_master_read(struct vme_master_resource *image, void *buf, size_t count, loff_t offset) { @@ -867,13 +869,13 @@ ssize_t ca91cx42_master_read(struct vme_master_resource *image, void *buf, * maximal configured data cycle is used and splits it * automatically for non-aligned addresses. */ - if ((int)addr & 0x1) { + if (check_aligned(addr, 0x1)) { *(u8 *)buf = ioread8(addr); done += 1; if (done == count) goto out; } - if ((int)addr & 0x2) { + if (check_aligned(addr, 0x2)) { if ((count - done) < 2) { *(u8 *)(buf + done) = ioread8(addr + done); done += 1; @@ -921,13 +923,13 @@ ssize_t ca91cx42_master_write(struct vme_master_resource *image, void *buf, /* 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 (check_aligned(addr, 0x1)) { iowrite8(*(u8 *)buf, addr); done += 1; if (done == count) goto out; } - if ((int)addr & 0x2) { + if (check_aligned(addr, 0x2)) { if ((count - done) < 2) { iowrite8(*(u8 *)(buf + done), addr + done); done += 1; @@ -980,7 +982,7 @@ 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 = (u32)(unsigned long)image->kern_base + offset; /* Address must be 4-byte aligned */ if (pci_addr & 0x3) { -- 1.7.3.3.400.g93cef _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
