git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into upstream
[pandora-kernel.git]
/
drivers
/
hid
/
hid-magicmouse.c
diff --git
a/drivers/hid/hid-magicmouse.c
b/drivers/hid/hid-magicmouse.c
index
e6dc151
..
11306b3
100644
(file)
--- a/
drivers/hid/hid-magicmouse.c
+++ b/
drivers/hid/hid-magicmouse.c
@@
-12,6
+12,8
@@
* any later version.
*/
* any later version.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/device.h>
#include <linux/hid.h>
#include <linux/module.h>
#include <linux/device.h>
#include <linux/hid.h>
#include <linux/module.h>
@@
-446,7
+448,7
@@
static int magicmouse_probe(struct hid_device *hdev,
msc = kzalloc(sizeof(*msc), GFP_KERNEL);
if (msc == NULL) {
msc = kzalloc(sizeof(*msc), GFP_KERNEL);
if (msc == NULL) {
-
dev_err(&hdev->
dev, "can't alloc magicmouse descriptor\n");
+
hid_err(h
dev, "can't alloc magicmouse descriptor\n");
return -ENOMEM;
}
return -ENOMEM;
}
@@
-459,13
+461,13
@@
static int magicmouse_probe(struct hid_device *hdev,
ret = hid_parse(hdev);
if (ret) {
ret = hid_parse(hdev);
if (ret) {
-
dev_err(&hdev->
dev, "magicmouse hid parse failed\n");
+
hid_err(h
dev, "magicmouse hid parse failed\n");
goto err_free;
}
ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
if (ret) {
goto err_free;
}
ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
if (ret) {
-
dev_err(&hdev->
dev, "magicmouse hw start failed\n");
+
hid_err(h
dev, "magicmouse hw start failed\n");
goto err_free;
}
goto err_free;
}
@@
-486,7
+488,7
@@
static int magicmouse_probe(struct hid_device *hdev,
}
if (!report) {
}
if (!report) {
-
dev_err(&hdev->
dev, "unable to register touch report\n");
+
hid_err(h
dev, "unable to register touch report\n");
ret = -ENOMEM;
goto err_stop_hw;
}
ret = -ENOMEM;
goto err_stop_hw;
}
@@
-495,8
+497,7
@@
static int magicmouse_probe(struct hid_device *hdev,
ret = hdev->hid_output_raw_report(hdev, feature, sizeof(feature),
HID_FEATURE_REPORT);
if (ret != sizeof(feature)) {
ret = hdev->hid_output_raw_report(hdev, feature, sizeof(feature),
HID_FEATURE_REPORT);
if (ret != sizeof(feature)) {
- dev_err(&hdev->dev, "unable to request touch data (%d)\n",
- ret);
+ hid_err(hdev, "unable to request touch data (%d)\n", ret);
goto err_stop_hw;
}
goto err_stop_hw;
}
@@
-540,7
+541,7
@@
static int __init magicmouse_init(void)
ret = hid_register_driver(&magicmouse_driver);
if (ret)
ret = hid_register_driver(&magicmouse_driver);
if (ret)
- pr
intk(KERN_ERR
"can't register magicmouse driver\n");
+ pr
_err(
"can't register magicmouse driver\n");
return ret;
}
return ret;
}