提交 b0a9cf29 编写于 作者: M Mike Frysinger 提交者: Greg Kroah-Hartman

USB: isp1362: fix build warnings on 64-bit systems

A bunch of places assumed pointers were 32-bits in size (bit checking and
debug output), but none of these affected runtime functionality.
Signed-off-by: NMike Frysinger <vapier@gentoo.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 d86a83f4
...@@ -2284,10 +2284,10 @@ static int isp1362_mem_config(struct usb_hcd *hcd) ...@@ -2284,10 +2284,10 @@ static int isp1362_mem_config(struct usb_hcd *hcd)
dev_info(hcd->self.controller, "ISP1362 Memory usage:\n"); dev_info(hcd->self.controller, "ISP1362 Memory usage:\n");
dev_info(hcd->self.controller, " ISTL: 2 * %4d: %4d @ $%04x:$%04x\n", dev_info(hcd->self.controller, " ISTL: 2 * %4d: %4d @ $%04x:$%04x\n",
istl_size / 2, istl_size, 0, istl_size / 2); istl_size / 2, istl_size, 0, istl_size / 2);
dev_info(hcd->self.controller, " INTL: %4d * (%3u+8): %4d @ $%04x\n", dev_info(hcd->self.controller, " INTL: %4d * (%3lu+8): %4d @ $%04x\n",
ISP1362_INTL_BUFFERS, intl_blksize - PTD_HEADER_SIZE, ISP1362_INTL_BUFFERS, intl_blksize - PTD_HEADER_SIZE,
intl_size, istl_size); intl_size, istl_size);
dev_info(hcd->self.controller, " ATL : %4d * (%3u+8): %4d @ $%04x\n", dev_info(hcd->self.controller, " ATL : %4d * (%3lu+8): %4d @ $%04x\n",
atl_buffers, atl_blksize - PTD_HEADER_SIZE, atl_buffers, atl_blksize - PTD_HEADER_SIZE,
atl_size, istl_size + intl_size); atl_size, istl_size + intl_size);
dev_info(hcd->self.controller, " USED/FREE: %4d %4d\n", total, dev_info(hcd->self.controller, " USED/FREE: %4d %4d\n", total,
...@@ -2677,12 +2677,12 @@ static int __devexit isp1362_remove(struct platform_device *pdev) ...@@ -2677,12 +2677,12 @@ static int __devexit isp1362_remove(struct platform_device *pdev)
DBG(0, "%s: Removing HCD\n", __func__); DBG(0, "%s: Removing HCD\n", __func__);
usb_remove_hcd(hcd); usb_remove_hcd(hcd);
DBG(0, "%s: Unmapping data_reg @ %08x\n", __func__, DBG(0, "%s: Unmapping data_reg @ %p\n", __func__,
(u32)isp1362_hcd->data_reg); isp1362_hcd->data_reg);
iounmap(isp1362_hcd->data_reg); iounmap(isp1362_hcd->data_reg);
DBG(0, "%s: Unmapping addr_reg @ %08x\n", __func__, DBG(0, "%s: Unmapping addr_reg @ %p\n", __func__,
(u32)isp1362_hcd->addr_reg); isp1362_hcd->addr_reg);
iounmap(isp1362_hcd->addr_reg); iounmap(isp1362_hcd->addr_reg);
res = platform_get_resource(pdev, IORESOURCE_MEM, 1); res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
...@@ -2810,16 +2810,16 @@ static int __init isp1362_probe(struct platform_device *pdev) ...@@ -2810,16 +2810,16 @@ static int __init isp1362_probe(struct platform_device *pdev)
return 0; return 0;
err6: err6:
DBG(0, "%s: Freeing dev %08x\n", __func__, (u32)isp1362_hcd); DBG(0, "%s: Freeing dev %p\n", __func__, isp1362_hcd);
usb_put_hcd(hcd); usb_put_hcd(hcd);
err5: err5:
DBG(0, "%s: Unmapping data_reg @ %08x\n", __func__, (u32)data_reg); DBG(0, "%s: Unmapping data_reg @ %p\n", __func__, data_reg);
iounmap(data_reg); iounmap(data_reg);
err4: err4:
DBG(0, "%s: Releasing mem region %08lx\n", __func__, (long unsigned int)data->start); DBG(0, "%s: Releasing mem region %08lx\n", __func__, (long unsigned int)data->start);
release_mem_region(data->start, resource_len(data)); release_mem_region(data->start, resource_len(data));
err3: err3:
DBG(0, "%s: Unmapping addr_reg @ %08x\n", __func__, (u32)addr_reg); DBG(0, "%s: Unmapping addr_reg @ %p\n", __func__, addr_reg);
iounmap(addr_reg); iounmap(addr_reg);
err2: err2:
DBG(0, "%s: Releasing mem region %08lx\n", __func__, (long unsigned int)addr->start); DBG(0, "%s: Releasing mem region %08lx\n", __func__, (long unsigned int)addr->start);
......
...@@ -580,7 +580,7 @@ static inline const char *ISP1362_INT_NAME(int n) ...@@ -580,7 +580,7 @@ static inline const char *ISP1362_INT_NAME(int n)
static inline void ALIGNSTAT(struct isp1362_hcd *isp1362_hcd, void *ptr) static inline void ALIGNSTAT(struct isp1362_hcd *isp1362_hcd, void *ptr)
{ {
unsigned p = (unsigned)ptr; unsigned long p = (unsigned long)ptr;
if (!(p & 0xf)) if (!(p & 0xf))
isp1362_hcd->stat16++; isp1362_hcd->stat16++;
else if (!(p & 0x7)) else if (!(p & 0x7))
...@@ -770,7 +770,7 @@ static void isp1362_write_fifo(struct isp1362_hcd *isp1362_hcd, void *buf, u16 l ...@@ -770,7 +770,7 @@ static void isp1362_write_fifo(struct isp1362_hcd *isp1362_hcd, void *buf, u16 l
if (!len) if (!len)
return; return;
if ((unsigned)dp & 0x1) { if ((unsigned long)dp & 0x1) {
/* not aligned */ /* not aligned */
for (; len > 1; len -= 2) { for (; len > 1; len -= 2) {
data = *dp++; data = *dp++;
...@@ -962,8 +962,8 @@ static void isp1362_read_buffer(struct isp1362_hcd *isp1362_hcd, void *buf, u16 ...@@ -962,8 +962,8 @@ static void isp1362_read_buffer(struct isp1362_hcd *isp1362_hcd, void *buf, u16
isp1362_write_diraddr(isp1362_hcd, offset, len); isp1362_write_diraddr(isp1362_hcd, offset, len);
DBG(3, "%s: Reading %d byte from buffer @%04x to memory @ %08x\n", __func__, DBG(3, "%s: Reading %d byte from buffer @%04x to memory @ %p\n",
len, offset, (u32)buf); __func__, len, offset, buf);
isp1362_write_reg16(isp1362_hcd, HCuPINT, HCuPINT_EOT); isp1362_write_reg16(isp1362_hcd, HCuPINT, HCuPINT_EOT);
_WARN_ON((isp1362_read_reg16(isp1362_hcd, HCuPINT) & HCuPINT_EOT)); _WARN_ON((isp1362_read_reg16(isp1362_hcd, HCuPINT) & HCuPINT_EOT));
...@@ -982,8 +982,8 @@ static void isp1362_write_buffer(struct isp1362_hcd *isp1362_hcd, void *buf, u16 ...@@ -982,8 +982,8 @@ static void isp1362_write_buffer(struct isp1362_hcd *isp1362_hcd, void *buf, u16
isp1362_write_diraddr(isp1362_hcd, offset, len); isp1362_write_diraddr(isp1362_hcd, offset, len);
DBG(3, "%s: Writing %d byte to buffer @%04x from memory @ %08x\n", __func__, DBG(3, "%s: Writing %d byte to buffer @%04x from memory @ %p\n",
len, offset, (u32)buf); __func__, len, offset, buf);
isp1362_write_reg16(isp1362_hcd, HCuPINT, HCuPINT_EOT); isp1362_write_reg16(isp1362_hcd, HCuPINT, HCuPINT_EOT);
_WARN_ON((isp1362_read_reg16(isp1362_hcd, HCuPINT) & HCuPINT_EOT)); _WARN_ON((isp1362_read_reg16(isp1362_hcd, HCuPINT) & HCuPINT_EOT));
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册