diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-25 14:34:49 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-25 14:34:49 -0700 |
| commit | 7b22a8855a727c5d8265508cbba05437a68f7043 (patch) | |
| tree | 752493e7055d4152c3abe485c2e9ddb478594180 /drivers/input/joystick/iforce/iforce-main.c | |
| parent | 9451df0ee893dbdfca626f2888654f321d241460 (diff) | |
USB: iforce: remove err() usage
err() was a very old USB-specific macro that I thought had gone away.
This patch removes it from being used in the driver and uses dev_err()
instead.
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/input/joystick/iforce/iforce-main.c')
| -rw-r--r-- | drivers/input/joystick/iforce/iforce-main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/joystick/iforce/iforce-main.c b/drivers/input/joystick/iforce/iforce-main.c index 405febd94f24..daeeb4c7e3b0 100644 --- a/drivers/input/joystick/iforce/iforce-main.c +++ b/drivers/input/joystick/iforce/iforce-main.c @@ -317,7 +317,8 @@ int iforce_init_device(struct iforce *iforce) break; if (i == 20) { /* 5 seconds */ - err("Timeout waiting for response from device."); + dev_err(&input_dev->dev, + "Timeout waiting for response from device.\n"); error = -ENODEV; goto fail; } |