diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-10-21 11:12:00 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-10-21 11:12:00 +0100 |
| commit | c3380942e6699ed5b3e3f37b49ceb724b7699813 (patch) | |
| tree | 516d791cdfd1c7f99a29f71e1a7bba8f75af96e1 /drivers/input/joystick/iforce/iforce-packets.c | |
| parent | 0ffda6cca2c66e42d0ad65719f58c637ed180b05 (diff) | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c64xx
Diffstat (limited to 'drivers/input/joystick/iforce/iforce-packets.c')
| -rw-r--r-- | drivers/input/joystick/iforce/iforce-packets.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/input/joystick/iforce/iforce-packets.c b/drivers/input/joystick/iforce/iforce-packets.c index 015b50aa76f..a17b5001600 100644 --- a/drivers/input/joystick/iforce/iforce-packets.c +++ b/drivers/input/joystick/iforce/iforce-packets.c @@ -65,7 +65,8 @@ int iforce_send_packet(struct iforce *iforce, u16 cmd, unsigned char* data) if (CIRC_SPACE(head, tail, XMIT_SIZE) < n+2) { - warn("not enough space in xmit buffer to send new packet"); + dev_warn(&iforce->dev->dev, + "not enough space in xmit buffer to send new packet\n"); spin_unlock_irqrestore(&iforce->xmit_lock, flags); return -1; } @@ -148,7 +149,7 @@ static int mark_core_as_ready(struct iforce *iforce, unsigned short addr) return 0; } } - warn("unused effect %04x updated !!!", addr); + dev_warn(&iforce->dev->dev, "unused effect %04x updated !!!\n", addr); return -1; } @@ -159,7 +160,8 @@ void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data) static int being_used = 0; if (being_used) - warn("re-entrant call to iforce_process %d", being_used); + dev_warn(&iforce->dev->dev, + "re-entrant call to iforce_process %d\n", being_used); being_used++; #ifdef CONFIG_JOYSTICK_IFORCE_232 |