diff options
Diffstat (limited to 'drivers/hid/hid-ntrig.c')
-rw-r--r-- | drivers/hid/hid-ntrig.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/hid/hid-ntrig.c b/drivers/hid/hid-ntrig.c index 69169efa1e16..beb403421e72 100644 --- a/drivers/hid/hid-ntrig.c +++ b/drivers/hid/hid-ntrig.c | |||
@@ -130,8 +130,7 @@ static void ntrig_report_version(struct hid_device *hdev) | |||
130 | if (ret == 8) { | 130 | if (ret == 8) { |
131 | ret = ntrig_version_string(&data[2], buf); | 131 | ret = ntrig_version_string(&data[2], buf); |
132 | 132 | ||
133 | dev_info(&hdev->dev, | 133 | hid_info(hdev, "Firmware version: %s (%02x%02x %02x%02x)\n", |
134 | "Firmware version: %s (%02x%02x %02x%02x)\n", | ||
135 | buf, data[2], data[3], data[4], data[5]); | 134 | buf, data[2], data[3], data[4], data[5]); |
136 | } | 135 | } |
137 | 136 | ||
@@ -831,7 +830,7 @@ static int ntrig_probe(struct hid_device *hdev, const struct hid_device_id *id) | |||
831 | 830 | ||
832 | nd = kmalloc(sizeof(struct ntrig_data), GFP_KERNEL); | 831 | nd = kmalloc(sizeof(struct ntrig_data), GFP_KERNEL); |
833 | if (!nd) { | 832 | if (!nd) { |
834 | dev_err(&hdev->dev, "cannot allocate N-Trig data\n"); | 833 | hid_err(hdev, "cannot allocate N-Trig data\n"); |
835 | return -ENOMEM; | 834 | return -ENOMEM; |
836 | } | 835 | } |
837 | 836 | ||
@@ -850,13 +849,13 @@ static int ntrig_probe(struct hid_device *hdev, const struct hid_device_id *id) | |||
850 | 849 | ||
851 | ret = hid_parse(hdev); | 850 | ret = hid_parse(hdev); |
852 | if (ret) { | 851 | if (ret) { |
853 | dev_err(&hdev->dev, "parse failed\n"); | 852 | hid_err(hdev, "parse failed\n"); |
854 | goto err_free; | 853 | goto err_free; |
855 | } | 854 | } |
856 | 855 | ||
857 | ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT & ~HID_CONNECT_FF); | 856 | ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT & ~HID_CONNECT_FF); |
858 | if (ret) { | 857 | if (ret) { |
859 | dev_err(&hdev->dev, "hw start failed\n"); | 858 | hid_err(hdev, "hw start failed\n"); |
860 | goto err_free; | 859 | goto err_free; |
861 | } | 860 | } |
862 | 861 | ||