iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V4L/DVB (4954): Fix: On ia64, i2c adap->inb/adap->outb are wrongly evaluated

Browse Source 
i2c defines two callbacks (inb/outb). On ia64, since it defines also two macros
with those names, it causes the following errors:
drivers/media/video/usbvision/usbvision-i2c.c:64:39: macro "outb" passed 4 arguments, but takes just 2
drivers/media/video/usbvision/usbvision-i2c.c: In function `try_write_address':
drivers/media/video/usbvision/usbvision-i2c.c:64: warning: assignment makes integer from pointer without a cast
drivers/media/video/usbvision/usbvision-i2c.c:89:38: macro "inb" passed 4 arguments, but takes just 1
drivers/media/video/usbvision/usbvision-i2c.c: In function `try_read_address':
drivers/media/video/usbvision/usbvision-i2c.c:89: warning: assignment makes integer from pointer without a cast
drivers/media/video/usbvision/usbvision-i2c.c:85: warning: unused variable `buf'
drivers/media/video/usbvision/usbvision-i2c.c:173:53: macro "inb" passed 4 arguments, but takes just 1
drivers/media/video/usbvision/usbvision-i2c.c: In function `usb_xfer':
drivers/media/video/usbvision/usbvision-i2c.c:173: warning: assignment makes integer from pointer without a cast
drivers/media/video/usbvision/usbvision-i2c.c:179:54: macro "outb" passed 4 arguments, but takes just 2
drivers/media/video/usbvision/usbvision-i2c.c:179: warning: assignment makes integer from pointer without a cast
thanks to Andrew Morton for pointing this.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Mauro Carvalho Chehab 2006-12-11 05:37:14 -03:00
parent 4259cb25d4
commit 2a7e9a260e
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/media/video/usbvision/usbvision-i2c.c
View File

@ -50,6 +50,11 @@ MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");
#define PDEBUG(level, fmt, args...) \ #define PDEBUG(level, fmt, args...) \
if (i2c_debug & (level)) info("[%s:%d] " fmt, __PRETTY_FUNCTION__, __LINE__ , ## args) if (i2c_debug & (level)) info("[%s:%d] " fmt, __PRETTY_FUNCTION__, __LINE__ , ## args)
static int usbvision_i2c_write(void *data, unsigned char addr, char *buf,
short len);
static int usbvision_i2c_read(void *data, unsigned char addr, char *buf,
short len);
static inline int try_write_address(struct i2c_adapter *i2c_adap, static inline int try_write_address(struct i2c_adapter *i2c_adap,
unsigned char addr, int retries) unsigned char addr, int retries)
{ {
@ -61,7 +66,7 @@ static inline int try_write_address(struct i2c_adapter *i2c_adap,
data = i2c_get_adapdata(i2c_adap); data = i2c_get_adapdata(i2c_adap);
buf[0] = 0x00; buf[0] = 0x00;
for (i = 0; i <= retries; i++) { for (i = 0; i <= retries; i++) {
ret = (adap->outb(data, addr, buf, 1)); ret = (usbvision_i2c_write(data, addr, buf, 1));
if (ret == 1) if (ret == 1)
break; /* success! */ break; /* success! */
udelay(5 /*adap->udelay */ ); udelay(5 /*adap->udelay */ );
@ -86,7 +91,7 @@ static inline int try_read_address(struct i2c_adapter *i2c_adap,
data = i2c_get_adapdata(i2c_adap); data = i2c_get_adapdata(i2c_adap);
for (i = 0; i <= retries; i++) { for (i = 0; i <= retries; i++) {
ret = (adap->inb(data, addr, buf, 1)); ret = (usbvision_i2c_read(data, addr, buf, 1));
if (ret == 1) if (ret == 1)
break; /* success! */ break; /* success! */
udelay(5 /*adap->udelay */ ); udelay(5 /*adap->udelay */ );
@ -153,7 +158,6 @@ static int
usb_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num) usb_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num)
{ {
struct i2c_msg *pmsg; struct i2c_msg *pmsg;
struct i2c_algo_usb_data *adap = i2c_adap->algo_data;
void *data; void *data;
int i, ret; int i, ret;
unsigned char addr; unsigned char addr;
@ -170,13 +174,13 @@ usb_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num)
if (pmsg->flags & I2C_M_RD) { if (pmsg->flags & I2C_M_RD) {
/* read bytes into buffer */ /* read bytes into buffer */
ret = (adap->inb(data, addr, pmsg->buf, pmsg->len)); ret = (usbvision_i2c_read(data, addr, pmsg->buf, pmsg->len));
if (ret < pmsg->len) { if (ret < pmsg->len) {
return (ret < 0) ? ret : -EREMOTEIO; return (ret < 0) ? ret : -EREMOTEIO;
} }
} else { } else {
/* write bytes from buffer */ /* write bytes from buffer */
ret = (adap->outb(data, addr, pmsg->buf, pmsg->len)); ret = (usbvision_i2c_write(data, addr, pmsg->buf, pmsg->len));
if (ret < pmsg->len) { if (ret < pmsg->len) {
return (ret < 0) ? ret : -EREMOTEIO; return (ret < 0) ? ret : -EREMOTEIO;
} }