[PATCH] matrox w1: fix integer to pointer conversion warnings

From: Jan Dittmer
Date: Sun Nov 14 2004 - 07:09:00 EST


Get rid of some pointer to integer conversion warnings
in the matrox w1 bus driver.

Signed-off-by: Jan Dittmer <jdittmer@xxxxxxxx>

diff -Nru a/drivers/w1/matrox_w1.c b/drivers/w1/matrox_w1.c
--- a/drivers/w1/matrox_w1.c 2004-11-14 13:03:45 +01:00
+++ b/drivers/w1/matrox_w1.c 2004-11-14 13:03:45 +01:00
@@ -78,11 +78,12 @@

struct matrox_device
{
- unsigned long base_addr;
- unsigned long port_index, port_data;
+ char *base_addr;
+ char *port_index, *port_data;
u8 data_mask;

- unsigned long phys_addr, virt_addr;
+ unsigned long phys_addr;
+ char *virt_addr;
unsigned long found;

struct w1_bus_master *bus_master;
@@ -181,8 +182,7 @@

dev->phys_addr = pci_resource_start(pdev, 1);

- dev->virt_addr =
- (unsigned long) ioremap_nocache(dev->phys_addr, 16384);
+ dev->virt_addr = ioremap_nocache(dev->phys_addr, 16384);
if (!dev->virt_addr) {
dev_err(&pdev->dev, "%s: failed to ioremap(0x%lx, %d).\n",
__func__, dev->phys_addr, 16384);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/