hid: hidpidff: Use pr_<level>
Subsystems (5)
PATCH 1/1 hid: hidpidff: Use pr_<level>
Prefixes were not standardized in this module.
Some used "hid-pidff:", others "hidpidff:".
Add pr_fmt(fmt) KBUILD_MODNAME ": " fmt to standardize prefix uses. Convert to pr_<level>, strip leading prefix.
Use normal pr_debug not debug, add trailing "\n". Coalesced long formats.
--- drivers/hid/usbhid/hid-pidff.c | 153 +++++++++++++++++---------------------- 1 files changed, 67 insertions(+), 86 deletions(-)
drivers/hid/usbhid/hid-pidff.c +67 -86
@@ -22,7 +22,7 @@/* #define DEBUG */ -#define debug(format, arg...) pr_debug("hid-pidff: " format "\n" , ## arg) +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt#include <linux/input.h> #include <linux/slab.h>
@@ -220,7 +220,7 @@ static int pidff_rescale_signed(int i, struct hid_field *field)static void pidff_set (struct pidff_usage *usage,u16 value) { usage->value[0 ] =pidff_rescale (value,0xffff , usage->field); -debug ("calculated from %d to %d" , value, usage->value[0 ]); +pr_debug ("calculated from %d to %d\n" , value, usage->value[0 ]); }static void pidff_set_signed (struct pidff_usage *usage,s16 value)
@@ -235,7 +235,7 @@ static void pidff_set_signed(struct pidff_usage *usage, s16 value) usage->value[0 ] =pidff_rescale (value,0x7fff , usage->field); } -debug ("calculated from %d to %d" , value, usage->value[0 ]); +pr_debug ("calculated from %d to %d\n" , value, usage->value[0 ]); }/*
@@ -259,8 +259,9 @@ static void pidff_set_envelope_report(struct pidff_device *pidff, pidff->set_envelope[PID_ATTACK_TIME ].value[0 ] = envelope->attack_length; pidff->set_envelope[PID_FADE_TIME ].value[0 ] = envelope->fade_length; -debug ("attack %u => %d" , envelope->attack_level, - pidff->set_envelope[PID_ATTACK_LEVEL ].value[0 ]); +pr_debug ("attack %u => %d\n" , + envelope->attack_level, + pidff->set_envelope[PID_ATTACK_LEVEL ].value[0 ]);usbhid_submit_report (pidff->hid, pidff->reports[PID_SET_ENVELOPE ],USB_DIR_OUT );
@@ -466,33 +467,33 @@ static int pidff_request_effect_upload(struct pidff_device *pidff, int efnum) pidff->create_new_effect_type->value[0 ] = efnum;usbhid_submit_report (pidff->hid, pidff->reports[PID_CREATE_NEW_EFFECT ],USB_DIR_OUT ); -debug ("create_new_effect sent, type: %d" , efnum); +pr_debug ("create_new_effect sent, type: %d\n" , efnum); pidff->block_load[PID_EFFECT_BLOCK_INDEX ].value[0 ] =0 ; pidff->block_load_status->value[0 ] =0 ;usbhid_wait_io (pidff->hid);for (j =0 ; j <60 ; j++) { -debug ("pid_block_load requested" ); +pr_debug ("pid_block_load requested\n" );usbhid_submit_report (pidff->hid, pidff->reports[PID_BLOCK_LOAD ],USB_DIR_IN );usbhid_wait_io (pidff->hid);if (pidff->block_load_status->value[0 ] == pidff->status_id[PID_BLOCK_LOAD_SUCCESS ]) { -debug ("device reported free memory: %d bytes" , - pidff->block_load[PID_RAM_POOL_AVAILABLE ].value ? - pidff->block_load[PID_RAM_POOL_AVAILABLE ].value[0 ] :-1 ); +pr_debug ("device reported free memory: %d bytes\n" , + pidff->block_load[PID_RAM_POOL_AVAILABLE ].value ? + pidff->block_load[PID_RAM_POOL_AVAILABLE ].value[0 ] :-1 );return 0 ; }if (pidff->block_load_status->value[0 ] == pidff->status_id[PID_BLOCK_LOAD_FULL ]) { -debug ("not enough memory free: %d bytes" , - pidff->block_load[PID_RAM_POOL_AVAILABLE ].value ? - pidff->block_load[PID_RAM_POOL_AVAILABLE ].value[0 ] :-1 ); +pr_debug ("not enough memory free: %d bytes\n" , + pidff->block_load[PID_RAM_POOL_AVAILABLE ].value ? + pidff->block_load[PID_RAM_POOL_AVAILABLE ].value[0 ] :-1 );return -ENOSPC ; } } -printk (KERN_ERR "hid-pidff: pid_block_load failed 60 times\n" ); +pr_err ("pid_block_load failed 60 times\n" );return -EIO ; }
@@ -546,7 +547,8 @@ static int pidff_erase_effect(struct input_dev *dev, int effect_id)struct pidff_device *pidff = dev->ff->private;int pid_id = pidff->pid_id[effect_id]; -debug ("starting to erase %d/%d" , effect_id, pidff->pid_id[effect_id]); +pr_debug ("starting to erase %d/%d\n" , + effect_id, pidff->pid_id[effect_id]);/* Wait for the queue to clear. We do not want a full fifo to prevent the effect removal. */ usbhid_wait_io (pidff->hid);
@@ -604,8 +606,7 @@ static int pidff_upload_effect(struct input_dev *dev, struct ff_effect *effect, type_id =PID_SAW_DOWN ;break ;default : -printk (KERN_ERR -"hid-pidff: invalid waveform\n" ); +pr_err ("invalid waveform\n" );return -EINVAL ; }
@@ -696,7 +697,7 @@ static int pidff_upload_effect(struct input_dev *dev, struct ff_effect *effect,break ;default : -printk (KERN_ERR "hid-pidff: invalid type\n" ); +pr_err ("invalid type\n" );return -EINVAL ; }
@@ -704,7 +705,7 @@ static int pidff_upload_effect(struct input_dev *dev, struct ff_effect *effect, pidff->pid_id[effect->id] = pidff->block_load[PID_EFFECT_BLOCK_INDEX ].value[0 ]; -debug ("uploaded" ); +pr_debug ("uploaded\n" );return 0 ; }
@@ -770,14 +771,14 @@ static int pidff_find_fields(struct pidff_usage *usage, const u8 *table,for (i =0 ; i < report->maxfield; i++) {if (report->field[i]->maxusage != report->field[i]->report_count) { -debug ("maxusage and report_count do not match, " -"skipping" ); +pr_debug ("maxusage and report_count do not match, skipping\n" );continue ; }for (j =0 ; j < report->field[i]->maxusage; j++) {if (report->field[i]->usage[j].hid == (HID_UP_PID | table[k])) { -debug ("found %d at %d->%d" , k, i, j); +pr_debug ("found %d at %d->%d\n" , + k, i, j); usage[k].field = report->field[i]; usage[k].value = &report->field[i]->value[j];
@@ -789,7 +790,7 @@ static int pidff_find_fields(struct pidff_usage *usage, const u8 *table,break ; }if (!found && strict) { -debug ("failed to locate %d" , k); +pr_debug ("failed to locate %d\n" , k);return -1 ; } }
@@ -826,8 +827,8 @@ static void pidff_find_reports(struct hid_device *hid, int report_type,continue ; ret =pidff_check_usage (report->field[0 ]->logical);if (ret !=-1 ) { -debug ("found usage 0x%02x from field->logical" , - pidff_reports[ret]); +pr_debug ("found usage 0x%02x from field->logical\n" , + pidff_reports[ret]); pidff->reports[ret] = report;continue ; }
@@ -845,8 +846,8 @@ static void pidff_find_reports(struct hid_device *hid, int report_type,continue ; ret =pidff_check_usage (hid->collection[i -1 ].usage);if (ret !=-1 && !pidff->reports[ret]) { -debug ("found usage 0x%02x from collection array" , - pidff_reports[ret]); +pr_debug ("found usage 0x%02x from collection array\n" , + pidff_reports[ret]); pidff->reports[ret] = report; } }
@@ -861,7 +862,7 @@ static int pidff_reports_ok(struct pidff_device *pidff)for (i =0 ; i <=PID_REQUIRED_REPORTS ; i++) {if (!pidff->reports[i]) { -debug ("%d missing" , i); +pr_debug ("%d missing\n" , i);return 0 ; } }
@@ -884,8 +885,7 @@ static struct hid_field *pidff_find_special_field(struct hid_report *report, report->field[i]->logical_minimum == 1) return report->field[i]; else { -printk (KERN_ERR "hid-pidff: logical_minimum " -"is not 1 as it should be\n" ); +pr_err ("logical_minimum is not 1 as it should be\n" );return NULL ; } }
@@ -924,7 +924,7 @@ static int pidff_find_special_keys(int *keys, struct hid_field *fld,*/ static int pidff_find_special_fields (struct pidff_device *pidff) { -debug ("finding special fields" ); +pr_debug ("finding special fields\n" ); pidff->create_new_effect_type = pidff_find_special_field(pidff->reports[PID_CREATE_NEW_EFFECT],
@@ -945,32 +945,30 @@ static int pidff_find_special_fields(struct pidff_device *pidff)pidff_find_special_field (pidff->reports[PID_EFFECT_OPERATION ],0x78 ,1 ); -debug ("search done" ); +pr_debug ("search done\n" );if (!pidff->create_new_effect_type || !pidff->set_effect_type) { -printk (KERN_ERR "hid-pidff: effect lists not found\n" ); +pr_err ("effect lists not found\n" );return -1 ; }if (!pidff->effect_direction) { -printk (KERN_ERR "hid-pidff: direction field not found\n" ); +pr_err ("direction field not found\n" );return -1 ; }if (!pidff->device_control) { -printk (KERN_ERR "hid-pidff: device control field not found\n" ); +pr_err ("device control field not found\n" );return -1 ; }if (!pidff->block_load_status) { -printk (KERN_ERR -"hid-pidff: block load status field not found\n" ); +pr_err ("block load status field not found\n" );return -1 ; }if (!pidff->effect_operation_status) { -printk (KERN_ERR -"hid-pidff: effect operation field not found\n" ); +pr_err ("effect operation field not found\n" );return -1 ; }
@@ -982,23 +980,21 @@ static int pidff_find_special_fields(struct pidff_device *pidff)if (!PIDFF_FIND_SPECIAL_KEYS (type_id, create_new_effect_type, effect_types)) { -printk (KERN_ERR "hid-pidff: no effect types found\n" ); +pr_err ("no effect types found\n" );return -1 ; }if (PIDFF_FIND_SPECIAL_KEYS (status_id, block_load_status, block_load_status) !=sizeof (pidff_block_load_status)) { -printk (KERN_ERR -"hidpidff: block load status identifiers not found\n" ); +pr_err ("block load status identifiers not found\n" );return -1 ; }if (PIDFF_FIND_SPECIAL_KEYS (operation_id, effect_operation_status, effect_operation_status) !=sizeof (pidff_effect_operation_status)) { -printk (KERN_ERR -"hidpidff: effect operation identifiers not found\n" ); +pr_err ("effect operation identifiers not found\n" );return -1 ; }
@@ -1017,8 +1013,7 @@ static int pidff_find_effects(struct pidff_device *pidff,int pidff_type = pidff->type_id[i];if (pidff->set_effect_type->usage[pidff_type].hid != pidff->create_new_effect_type->usage[pidff_type].hid) { -printk (KERN_ERR "hid-pidff: " -"effect type number %d is invalid\n" , i); +pr_err ("effect type number %d is invalid\n" , i);return -1 ; } }
@@ -1073,27 +1068,23 @@ static int pidff_init_fields(struct pidff_device *pidff, struct input_dev *dev)int envelope_ok =0 ;if (PIDFF_FIND_FIELDS (set_effect,PID_SET_EFFECT ,1 )) { -printk (KERN_ERR -"hid-pidff: unknown set_effect report layout\n" ); +pr_err ("unknown set_effect report layout\n" );return -ENODEV ; }PIDFF_FIND_FIELDS (block_load,PID_BLOCK_LOAD ,0 );if (!pidff->block_load[PID_EFFECT_BLOCK_INDEX ].value) { -printk (KERN_ERR -"hid-pidff: unknown pid_block_load report layout\n" ); +pr_err ("unknown pid_block_load report layout\n" );return -ENODEV ; }if (PIDFF_FIND_FIELDS (effect_operation,PID_EFFECT_OPERATION ,1 )) { -printk (KERN_ERR -"hid-pidff: unknown effect_operation report layout\n" ); +pr_err ("unknown effect_operation report layout\n" );return -ENODEV ; }if (PIDFF_FIND_FIELDS (block_free,PID_BLOCK_FREE ,1 )) { -printk (KERN_ERR -"hid-pidff: unknown pid_block_free report layout\n" ); +pr_err ("unknown pid_block_free report layout\n" );return -ENODEV ; }
@@ -1105,27 +1096,23 @@ static int pidff_init_fields(struct pidff_device *pidff, struct input_dev *dev)if (!envelope_ok) {if (test_and_clear_bit (FF_CONSTANT , dev->ffbit)) -printk (KERN_WARNING "hid-pidff: " -"has constant effect but no envelope\n" ); +pr_warn ("has constant effect but no envelope\n" );if (test_and_clear_bit (FF_RAMP , dev->ffbit)) -printk (KERN_WARNING "hid-pidff: " -"has ramp effect but no envelope\n" ); +pr_warn ("has ramp effect but no envelope\n" );if (test_and_clear_bit (FF_PERIODIC , dev->ffbit)) -printk (KERN_WARNING "hid-pidff: " -"has periodic effect but no envelope\n" ); +pr_warn ("has periodic effect but no envelope\n" ); }if (test_bit (FF_CONSTANT , dev->ffbit) &&PIDFF_FIND_FIELDS (set_constant,PID_SET_CONSTANT ,1 )) { -printk (KERN_WARNING -"hid-pidff: unknown constant effect layout\n" ); +pr_warn ("unknown constant effect layout\n" );clear_bit (FF_CONSTANT , dev->ffbit); }if (test_bit (FF_RAMP , dev->ffbit) &&PIDFF_FIND_FIELDS (set_ramp,PID_SET_RAMP ,1 )) { -printk (KERN_WARNING "hid-pidff: unknown ramp effect layout\n" ); +pr_warn ("unknown ramp effect layout\n" );clear_bit (FF_RAMP , dev->ffbit); }
@@ -1134,8 +1121,7 @@ static int pidff_init_fields(struct pidff_device *pidff, struct input_dev *dev) test_bit(FF_FRICTION, dev->ffbit) || test_bit(FF_INERTIA, dev->ffbit)) && PIDFF_FIND_FIELDS(set_condition, PID_SET_CONDITION, 1)) { -printk (KERN_WARNING -"hid-pidff: unknown condition effect layout\n" ); +pr_warn ("unknown condition effect layout\n" );clear_bit (FF_SPRING , dev->ffbit);clear_bit (FF_DAMPER , dev->ffbit);clear_bit (FF_FRICTION , dev->ffbit);
@@ -1144,8 +1130,7 @@ static int pidff_init_fields(struct pidff_device *pidff, struct input_dev *dev)if (test_bit (FF_PERIODIC , dev->ffbit) &&PIDFF_FIND_FIELDS (set_periodic,PID_SET_PERIODIC ,1 )) { -printk (KERN_WARNING -"hid-pidff: unknown periodic effect layout\n" ); +pr_warn ("unknown periodic effect layout\n" );clear_bit (FF_PERIODIC , dev->ffbit); }
@@ -1184,12 +1169,11 @@ static void pidff_reset(struct pidff_device *pidff)if (pidff->pool[PID_SIMULTANEOUS_MAX ].value) {while (pidff->pool[PID_SIMULTANEOUS_MAX ].value[0 ] <2 ) {if (i++ >20 ) { -printk (KERN_WARNING "hid-pidff: device reports " -"%d simultaneous effects\n" , - pidff->pool[PID_SIMULTANEOUS_MAX ].value[0 ]); +pr_warn ("device reports %d simultaneous effects\n" , + pidff->pool[PID_SIMULTANEOUS_MAX ].value[0 ]);break ; } -debug ("pid_pool requested again" ); +pr_debug ("pid_pool requested again\n" );usbhid_submit_report (hid, pidff->reports[PID_POOL ],USB_DIR_IN );usbhid_wait_io (hid);
@@ -1215,7 +1199,7 @@ static int pidff_check_autocenter(struct pidff_device *pidff, error =pidff_request_effect_upload (pidff,1 );if (error) { -printk (KERN_ERR "hid-pidff: upload request failed\n" ); +pr_err ("upload request failed\n" );return error; }
@@ -1224,8 +1208,7 @@ static int pidff_check_autocenter(struct pidff_device *pidff,pidff_autocenter (pidff,0xffff );set_bit (FF_AUTOCENTER , dev->ffbit); }else { -printk (KERN_NOTICE "hid-pidff: " -"device has unknown autocenter control method\n" ); +pr_notice ("device has unknown autocenter control method\n" ); } pidff_erase_pid(pidff,
@@ -1248,10 +1231,10 @@ int hid_pidff_init(struct hid_device *hid)int max_effects;int error; -debug ("starting pid init" ); +pr_debug ("starting pid init\n" );if (list_empty (&hid->report_enum[HID_OUTPUT_REPORT ].report_list)) { -debug ("not a PID device, no output report" ); +pr_debug ("not a PID device, no output report\n" );return -ENODEV ; }
@@ -1265,7 +1248,7 @@ int hid_pidff_init(struct hid_device *hid)pidff_find_reports (hid,HID_FEATURE_REPORT , pidff);if (!pidff_reports_ok (pidff)) { -debug ("reports not ok, aborting" ); +pr_debug ("reports not ok, aborting\n" ); error = -ENODEV ; goto fail; }
@@ -1290,23 +1273,22 @@ int hid_pidff_init(struct hid_device *hid) pidff->block_load[PID_EFFECT_BLOCK_INDEX ].field->logical_maximum - pidff->block_load[PID_EFFECT_BLOCK_INDEX ].field->logical_minimum +1 ; -debug ("max effects is %d" , max_effects); +pr_debug ("max effects is %d\n" , max_effects);if (max_effects >PID_EFFECTS_MAX ) max_effects =PID_EFFECTS_MAX ;if (pidff->pool[PID_SIMULTANEOUS_MAX ].value) -debug ("max simultaneous effects is %d" , - pidff->pool[PID_SIMULTANEOUS_MAX ].value[0 ]); +pr_debug ("max simultaneous effects is %d\n" , + pidff->pool[PID_SIMULTANEOUS_MAX ].value[0 ]);if (pidff->pool[PID_RAM_POOL_SIZE ].value) -debug ("device memory size is %d bytes" , - pidff->pool[PID_RAM_POOL_SIZE ].value[0 ]); +pr_debug ("device memory size is %d bytes\n" , + pidff->pool[PID_RAM_POOL_SIZE ].value[0 ]);if (pidff->pool[PID_DEVICE_MANAGED_POOL ].value && pidff->pool[PID_DEVICE_MANAGED_POOL ].value[0 ] ==0 ) { -printk (KERN_NOTICE "hid-pidff: " -"device does not support device managed pool\n" ); +pr_notice ("device does not support device managed pool\n" ); goto fail; }
@@ -1322,8 +1304,7 @@ int hid_pidff_init(struct hid_device *hid) ff->set_autocenter = pidff_set_autocenter; ff->playback = pidff_playback; -printk (KERN_INFO "Force feedback for USB HID PID devices by " -"Anssi Hannula <[email protected]>\n" ); +pr_info ("Force feedback for USB HID PID devices by Anssi Hannula <[email protected]>\n" );return 0 ;
Quoted 3 lines · Joe Perches
Prefixes were not standardized in this module.
Some used "hid-pidff:", others "hidpidff:".
Addpr_fmt(fmt)KBUILD_MODNAME": " fmt to standardize prefix uses.
Hmm, how about using dev_dbg instead? So that we get the bonus of having the device name there for free?
Thanks,
Signature · 6 lines
Jiri Kosina SUSE Labs, Novell Inc. -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 6 lines · Jiri Kosina
Quoted 3 lines · Joe Perches
Prefixes were not standardized in this module.
Some used "hid-pidff:", others "hidpidff:".
Addpr_fmt(fmt)KBUILD_MODNAME": " fmt to standardize prefix uses.Hmm, how about using
dev_dbginstead? So that we get the bonus of having the device name there for free?
Too much restructuring required.
There's no device available in many of the pr_debug uses.
Jiri Kosina
AppliedQuoted 8 lines · Joe Perches
Quoted 5 lines
Quoted 3 lines
Prefixes were not standardized in this module.
Some used "hid-pidff:", others "hidpidff:".
Addpr_fmt(fmt)KBUILD_MODNAME": " fmt to standardize prefix uses.Hmm, how about using
dev_dbginstead? So that we get the bonus of having the device name there for free?Too much restructuring required.
There's no device available in many of thepr_debuguses.
Applied, thanks.
Signature · 2 lines
Jiri Kosina SUSE Labs, Novell Inc.
PATCH 1/1 hid: Add and use hid_<level>: dev_<level> equivalents
In reply to Jiri KosinaNeaten current uses of dev_<level> by adding and using hid specific hid_<level> macros.
Convert existing uses of dev_<level> uses to hid_<level>. Convert hid-pidff printk to use hid_<level>.
Remove err_hid and use hid_err instead.
Add missing newlines to logging messages where necessary. Coalesce format strings.
Add and use pr_fmt(fmt) KBUILD_MODNAME ": " fmt
Other miscellaneous changes:
Convert vmalloc/memset to vzalloc
Remove unnecessary __inline_ from some static functions. Add const struct hid_device * as argument to some functions so hid_<level> can be used as appropriate.
Remove unnecessary multiplies in inner loops, use += instead.
--- drivers/hid/hid-3m-pct.c | 2 +- drivers/hid/hid-a4tech.c | 6 +- drivers/hid/hid-apple.c | 14 ++-- drivers/hid/hid-axff.c | 14 ++-- drivers/hid/hid-belkin.c | 4 +- drivers/hid/hid-cando.c | 2 +- drivers/hid/hid-cherry.c | 3 +- drivers/hid/hid-core.c | 93 +++++++++++++--------- drivers/hid/hid-cypress.c | 4 +- drivers/hid/hid-debug.c | 4 +- drivers/hid/hid-drff.c | 14 ++-- drivers/hid/hid-egalax.c | 2 +- drivers/hid/hid-elecom.c | 3 +- drivers/hid/hid-emsff.c | 13 ++-- drivers/hid/hid-gaff.c | 13 ++-- drivers/hid/hid-input.c | 2 +- drivers/hid/hid-kye.c | 4 +- drivers/hid/hid-lg.c | 15 ++-- drivers/hid/hid-lg2ff.c | 9 +- drivers/hid/hid-lg3ff.c | 9 +- drivers/hid/hid-lg4ff.c | 9 +- drivers/hid/hid-lgff.c | 8 +- drivers/hid/hid-magicmouse.c | 15 ++-- drivers/hid/hid-microsoft.c | 7 +- drivers/hid/hid-monterey.c | 3 +- drivers/hid/hid-mosart.c | 2 +- drivers/hid/hid-ntrig.c | 9 +- drivers/hid/hid-ortek.c | 3 +- drivers/hid/hid-petalynx.c | 7 +- drivers/hid/hid-picolcd.c | 45 +++++------ drivers/hid/hid-pl.c | 16 ++-- drivers/hid/hid-prodikeys.c | 21 +++--- drivers/hid/hid-quanta.c | 2 +- drivers/hid/hid-roccat-kone.c | 22 +++--- drivers/hid/hid-roccat-pyra.c | 20 ++--- drivers/hid/hid-roccat.c | 10 +- drivers/hid/hid-samsung.c | 8 +- drivers/hid/hid-sjoy.c | 16 ++-- drivers/hid/hid-sony.c | 11 +-- drivers/hid/hid-stantum.c | 2 +- drivers/hid/hid-sunplus.c | 3 +- drivers/hid/hid-tmff.c | 27 +++---- drivers/hid/hid-wacom.c | 26 +++--- drivers/hid/hid-zpff.c | 11 +-- drivers/hid/hid-zydacron.c | 11 +-- drivers/hid/hidraw.c | 12 ++- drivers/hid/usbhid/hid-core.c | 48 +++++------ drivers/hid/usbhid/hid-pidff.c | 173 +++++++++++++++++++--------------------- drivers/hid/usbhid/hiddev.c | 2 +- drivers/hid/usbhid/usbkbd.c | 22 +++--- include/linux/hid.h | 32 ++++++-- 51 files changed, 419 insertions(+), 414 deletions(-)
drivers/hid/hid-3m-pct.c +1 -1
@@ -274,7 +274,7 @@ static int mmm_probe(struct hid_device *hdev, const struct hid_device_id *id) md =kzalloc (sizeof (struct mmm_data ),GFP_KERNEL );if (!md) { -dev_err (&hdev->dev,"cannot allocate 3M data\n" ); +hid_err (hdev,"cannot allocate 3M data\n" );return -ENOMEM ; }hid_set_drvdata (hdev, md);
drivers/hid/hid-a4tech.c +3 -3
@@ -93,7 +93,7 @@ static int a4_probe(struct hid_device *hdev, const struct hid_device_id *id) a4 =kzalloc (sizeof (*a4),GFP_KERNEL );if (a4 ==NULL ) { -dev_err (&hdev->dev,"can't alloc device descriptor\n" ); +hid_err (hdev,"can't alloc device descriptor\n" ); ret = -ENOMEM ; goto err_free; }
@@ -104,13 +104,13 @@ static int a4_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err_free; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT );if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err_free; }
drivers/hid/hid-apple.c +8 -6
@@ -16,6 +16,8 @@* any later version. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/device.h> #include <linux/hid.h> #include <linux/module.h>
@@ -280,8 +282,8 @@ static __u8 *apple_report_fixup(struct hid_device *hdev, __u8 *rdesc,if ((asc->quirks &APPLE_RDESC_JIS ) && *rsize >=60 && rdesc[53 ] ==0x65 && rdesc[59 ] ==0x65 ) { -dev_info (&hdev->dev,"fixing up MacBook JIS keyboard report " -"descriptor\n" ); +hid_info (hdev, +"fixing up MacBook JIS keyboard report descriptor\n" ); rdesc[53 ] = rdesc[59 ] =0xe7 ; }return rdesc;
@@ -351,7 +353,7 @@ static int apple_probe(struct hid_device *hdev, asc =kzalloc (sizeof (*asc),GFP_KERNEL );if (asc ==NULL ) { -dev_err (&hdev->dev,"can't alloc apple descriptor\n" ); +hid_err (hdev,"can't alloc apple descriptor\n" );return -ENOMEM ; }
@@ -361,7 +363,7 @@ static int apple_probe(struct hid_device *hdev, ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err_free; }
@@ -372,7 +374,7 @@ static int apple_probe(struct hid_device *hdev, ret =hid_hw_start (hdev, connect_mask);if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err_free; }
@@ -512,7 +514,7 @@ static int __init apple_init(void) ret =hid_register_driver (&apple_driver);if (ret) -printk (KERN_ERR "can't register apple driver\n" ); +pr_err ("can't register apple driver\n" );return ret; }
drivers/hid/hid-axff.c +7 -7
@@ -73,14 +73,14 @@ static int axff_init(struct hid_device *hid)int error;if (list_empty (report_list)) { -dev_err (&hid->dev,"no output reports found\n" ); +hid_err (hid,"no output reports found\n" );return -ENODEV ; } report = list_first_entry(report_list, struct hid_report, list);if (report->maxfield <4 ) { -dev_err (&hid->dev,"no fields in the report: %d\n" , report->maxfield); +hid_err (hid,"no fields in the report: %d\n" , report->maxfield);return -ENODEV ; }
@@ -101,7 +101,7 @@ static int axff_init(struct hid_device *hid) axff->report->field[3 ]->value[0 ] =0x00 ;usbhid_submit_report (hid, axff->report,USB_DIR_OUT ); -dev_info (&hid->dev,"Force Feedback for ACRUX game controllers by Sergei Kolzun<[email protected]>\n" ); +hid_info (hid,"Force Feedback for ACRUX game controllers by Sergei Kolzun<[email protected]>\n" );return 0 ;
@@ -114,17 +114,17 @@ static int ax_probe(struct hid_device *hdev, const struct hid_device_id *id) {int error; -dev_dbg (&hdev->dev,"ACRUX HID hardware probe..." ); +dev_dbg (&hdev->dev,"ACRUX HID hardware probe...\n" ); error =hid_parse (hdev);if (error) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" );return error; } error =hid_hw_start (hdev,HID_CONNECT_DEFAULT & ~HID_CONNECT_FF );if (error) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" );return error; }
@@ -134,7 +134,7 @@ static int ax_probe(struct hid_device *hdev, const struct hid_device_id *id)* Do not fail device initialization completely as device * may still be partially operable, just warn. */ -dev_warn (&hdev->dev, +hid_warn (hdev,"Failed to enable force feedback support, error: %d\n" , error); }
drivers/hid/hid-belkin.c +2 -2
@@ -56,14 +56,14 @@ static int belkin_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err_free; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT | ((quirks &BELKIN_HIDDEV ) ?HID_CONNECT_HIDDEV_FORCE :0 ));if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err_free; }
drivers/hid/hid-cando.c +1 -1
@@ -207,7 +207,7 @@ static int cando_probe(struct hid_device *hdev, const struct hid_device_id *id) td =kmalloc (sizeof (struct cando_data ),GFP_KERNEL );if (!td) { -dev_err (&hdev->dev,"cannot allocate Cando Touch data\n" ); +hid_err (hdev,"cannot allocate Cando Touch data\n" );return -ENOMEM ; }hid_set_drvdata (hdev, td);
drivers/hid/hid-cherry.c +1 -2
@@ -30,8 +30,7 @@ static __u8 *ch_report_fixup(struct hid_device *hdev, __u8 *rdesc, unsigned int *rsize) {if (*rsize >=17 && rdesc[11 ] ==0x3c && rdesc[12 ] ==0x02 ) { -dev_info (&hdev->dev,"fixing up Cherry Cymotion report " -"descriptor\n" ); +hid_info (hdev,"fixing up Cherry Cymotion report descriptor\n" ); rdesc[11 ] = rdesc[16 ] =0xff ; rdesc[12 ] = rdesc[17 ] =0x03 ; }
drivers/hid/hid-core.c +54 -39
195 lines not on this page · raw message
drivers/hid/hid-cypress.c +2 -2
@@ -107,13 +107,13 @@ static int cp_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err_free; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT );if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err_free; }
drivers/hid/hid-debug.c +3 -1
@@ -26,6 +26,8 @@* Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/debugfs.h> #include <linux/seq_file.h> #include <linux/sched.h>
@@ -393,7 +395,7 @@ char *hid_resolv_usage(unsigned usage, struct seq_file *f) { buf =resolv_usage_page (usage >>16 , f);if (IS_ERR (buf)) { -printk (KERN_ERR "error allocating HID debug buffer\n" ); +pr_err ("error allocating HID debug buffer\n" );return NULL ; }
drivers/hid/hid-drff.c +7 -7
@@ -96,18 +96,18 @@ static int drff_init(struct hid_device *hid)int error;if (list_empty (report_list)) { -dev_err (&hid->dev,"no output reports found\n" ); +hid_err (hid,"no output reports found\n" );return -ENODEV ; } report = list_first_entry(report_list, struct hid_report, list);if (report->maxfield <1 ) { -dev_err (&hid->dev,"no fields in the report\n" ); +hid_err (hid,"no fields in the report\n" );return -ENODEV ; }if (report->field[0 ]->report_count <7 ) { -dev_err (&hid->dev,"not enough values in the field\n" ); +hid_err (hid,"not enough values in the field\n" );return -ENODEV ; }
@@ -133,8 +133,8 @@ static int drff_init(struct hid_device *hid) drff->report->field[0 ]->value[6 ] =0x00 ;usbhid_submit_report (hid, drff->report,USB_DIR_OUT ); -dev_info (&hid->dev,"Force Feedback for DragonRise Inc. game " -"controllers by Richard Walmsley <[email protected]>\n" ); +hid_info (hid,"Force Feedback for DragonRise Inc. " +"game controllers by Richard Walmsley <[email protected]>\n" );return 0 ; }
@@ -153,13 +153,13 @@ static int dr_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT & ~HID_CONNECT_FF );if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err; }
drivers/hid/hid-egalax.c +1 -1
@@ -223,7 +223,7 @@ static int egalax_probe(struct hid_device *hdev, const struct hid_device_id *id) td =kzalloc (sizeof (struct egalax_data ),GFP_KERNEL );if (!td) { -dev_err (&hdev->dev,"cannot allocate eGalax data\n" ); +hid_err (hdev,"cannot allocate eGalax data\n" );return -ENOMEM ; }hid_set_drvdata (hdev, td);
drivers/hid/hid-elecom.c +1 -2
@@ -24,8 +24,7 @@ static __u8 *elecom_report_fixup(struct hid_device *hdev, __u8 *rdesc, unsigned int *rsize) {if (*rsize >=48 && rdesc[46 ] ==0x05 && rdesc[47 ] ==0x0c ) { -dev_info (&hdev->dev,"Fixing up Elecom BM084 " -"report descriptor.\n" ); +hid_info (hdev,"Fixing up Elecom BM084 report descriptor\n" ); rdesc[47 ] =0x00 ; }return rdesc;
drivers/hid/hid-emsff.c +6 -7
@@ -68,18 +68,18 @@ static int emsff_init(struct hid_device *hid)int error;if (list_empty (report_list)) { -dev_err (&hid->dev,"no output reports found\n" ); +hid_err (hid,"no output reports found\n" );return -ENODEV ; } report = list_first_entry(report_list, struct hid_report, list);if (report->maxfield <1 ) { -dev_err (&hid->dev,"no fields in the report\n" ); +hid_err (hid,"no fields in the report\n" );return -ENODEV ; }if (report->field[0 ]->report_count <7 ) { -dev_err (&hid->dev,"not enough values in the field\n" ); +hid_err (hid,"not enough values in the field\n" );return -ENODEV ; }
@@ -105,8 +105,7 @@ static int emsff_init(struct hid_device *hid) emsff->report->field[0 ]->value[6 ] =0x00 ;usbhid_submit_report (hid, emsff->report,USB_DIR_OUT ); -dev_info (&hid->dev,"force feedback for EMS based devices by " -"Ignaz Forster <[email protected]>\n" ); +hid_info (hid,"force feedback for EMS based devices by Ignaz Forster <[email protected]>\n" );return 0 ; }
@@ -117,13 +116,13 @@ static int ems_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT & ~HID_CONNECT_FF );if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err; }
drivers/hid/hid-gaff.c +6 -7
@@ -87,7 +87,7 @@ static int gaff_init(struct hid_device *hid)int error;if (list_empty (report_list)) { -dev_err (&hid->dev,"no output reports found\n" ); +hid_err (hid,"no output reports found\n" );return -ENODEV ; }
@@ -95,12 +95,12 @@ static int gaff_init(struct hid_device *hid) report = list_entry(report_ptr, struct hid_report, list);if (report->maxfield <1 ) { -dev_err (&hid->dev,"no fields in the report\n" ); +hid_err (hid,"no fields in the report\n" );return -ENODEV ; }if (report->field[0 ]->report_count <6 ) { -dev_err (&hid->dev,"not enough values in the field\n" ); +hid_err (hid,"not enough values in the field\n" );return -ENODEV ; }
@@ -128,8 +128,7 @@ static int gaff_init(struct hid_device *hid)usbhid_submit_report (hid, gaff->report,USB_DIR_OUT ); -dev_info (&hid->dev,"Force Feedback for GreenAsia 0x12" -" devices by Lukasz Lubojanski <[email protected]>\n" ); +hid_info (hid,"Force Feedback for GreenAsia 0x12 devices by Lukasz Lubojanski <[email protected]>\n" );return 0 ; }
@@ -148,13 +147,13 @@ static int ga_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT & ~HID_CONNECT_FF );if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err; }
drivers/hid/hid-input.c +1 -1
@@ -868,7 +868,7 @@ int hidinput_connect(struct hid_device *hid, unsigned int force)if (!hidinput || !input_dev) {kfree (hidinput);input_free_device (input_dev); -err_hid ("Out of memory during hid input probe" ); +hid_err (hid,"Out of memory during hid input probe\n" ); goto out_unwind; }
drivers/hid/hid-kye.c +2 -2
@@ -32,8 +32,8 @@ static __u8 *kye_report_fixup(struct hid_device *hdev, __u8 *rdesc, rdesc[65] == 0x29 && rdesc[66] == 0x0f && rdesc[71] == 0x75 && rdesc[72] == 0x08 && rdesc[73] == 0x95 && rdesc[74] == 0x01) { -dev_info (&hdev->dev,"fixing up Kye/Genius Ergo Mouse report " -"descriptor\n" ); +hid_info (hdev, +"fixing up Kye/Genius Ergo Mouse report descriptor\n" ); rdesc[62 ] =0x09 ; rdesc[64 ] =0x04 ; rdesc[66 ] =0x07 ;
drivers/hid/hid-lg.c +7 -8
@@ -53,23 +53,22 @@ static __u8 *lg_report_fixup(struct hid_device *hdev, __u8 *rdesc,if ((quirks &LG_RDESC ) && *rsize >=90 && rdesc[83 ] ==0x26 && rdesc[84 ] ==0x8c && rdesc[85 ] ==0x02 ) { -dev_info (&hdev->dev,"fixing up Logitech keyboard report " -"descriptor\n" ); +hid_info (hdev, +"fixing up Logitech keyboard report descriptor\n" ); rdesc[84 ] = rdesc[89 ] =0x4d ; rdesc[85 ] = rdesc[90 ] =0x10 ; }if ((quirks &LG_RDESC_REL_ABS ) && *rsize >=50 && rdesc[32 ] ==0x81 && rdesc[33 ] ==0x06 && rdesc[49 ] ==0x81 && rdesc[50 ] ==0x06 ) { -dev_info (&hdev->dev,"fixing up rel/abs in Logitech " -"report descriptor\n" ); +hid_info (hdev, +"fixing up rel/abs in Logitech report descriptor\n" ); rdesc[33 ] = rdesc[50 ] =0x02 ; }if ((quirks &LG_FF4 ) && *rsize >=101 && rdesc[41 ] ==0x95 && rdesc[42 ] ==0x0B && rdesc[47 ] ==0x05 && rdesc[48 ] ==0x09 ) { -dev_info (&hdev->dev,"fixing up Logitech Speed Force Wireless " -"button descriptor\n" ); +hid_info (hdev,"fixing up Logitech Speed Force Wireless button descriptor\n" ); rdesc[41 ] =0x05 ; rdesc[42 ] =0x09 ; rdesc[47 ] =0x95 ;
@@ -288,7 +287,7 @@ static int lg_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err_free; }
@@ -297,7 +296,7 @@ static int lg_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_hw_start (hdev, connect_mask);if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err_free; }
drivers/hid/hid-lg2ff.c +4 -5
@@ -72,18 +72,18 @@ int lg2ff_init(struct hid_device *hid)int error;if (list_empty (report_list)) { -dev_err (&hid->dev,"no output report found\n" ); +hid_err (hid,"no output report found\n" );return -ENODEV ; } report = list_entry(report_list->next, struct hid_report, list);if (report->maxfield <1 ) { -dev_err (&hid->dev,"output report is empty\n" ); +hid_err (hid,"output report is empty\n" );return -ENODEV ; }if (report->field[0 ]->report_count <7 ) { -dev_err (&hid->dev,"not enough values in the field\n" ); +hid_err (hid,"not enough values in the field\n" );return -ENODEV ; }
@@ -110,8 +110,7 @@ int lg2ff_init(struct hid_device *hid)usbhid_submit_report (hid, report,USB_DIR_OUT ); -dev_info (&hid->dev,"Force feedback for Logitech RumblePad/Rumblepad 2 by " -"Anssi Hannula <[email protected]>\n" ); +hid_info (hid,"Force feedback for Logitech RumblePad/Rumblepad 2 by Anssi Hannula <[email protected]>\n" );return 0 ; }
drivers/hid/hid-lg3ff.c +4 -5
@@ -141,20 +141,20 @@ int lg3ff_init(struct hid_device *hid)/* Find the report to use */ if (list_empty (report_list)) { -err_hid ("No output report found" ); +hid_err (hid,"No output report found\n" );return -1 ; }/* Check that the report looks ok */ report = list_entry(report_list->next, struct hid_report, list);if (!report) { -err_hid ("NULL output report" ); +hid_err (hid,"NULL output report\n" );return -1 ; } field = report->field[0 ];if (!field) { -err_hid ("NULL field" ); +hid_err (hid,"NULL field\n" );return -1 ; }
@@ -169,8 +169,7 @@ int lg3ff_init(struct hid_device *hid)if (test_bit (FF_AUTOCENTER , dev->ffbit)) dev->ff->set_autocenter = hid_lg3ff_set_autocenter; -dev_info (&hid->dev,"Force feedback for Logitech Flight System G940 by " -"Gary Stein <[email protected]>\n" ); +hid_info (hid,"Force feedback for Logitech Flight System G940 by Gary Stein <[email protected]>\n" );return 0 ; }
drivers/hid/hid-lg4ff.c +4 -5
@@ -101,20 +101,20 @@ int lg4ff_init(struct hid_device *hid)/* Find the report to use */ if (list_empty (report_list)) { -err_hid ("No output report found" ); +hid_err (hid,"No output report found\n" );return -1 ; }/* Check that the report looks ok */ report = list_entry(report_list->next, struct hid_report, list);if (!report) { -err_hid ("NULL output report" ); +hid_err (hid,"NULL output report\n" );return -1 ; } field = report->field[0 ];if (!field) { -err_hid ("NULL field" ); +hid_err (hid,"NULL field\n" );return -1 ; }
@@ -129,8 +129,7 @@ int lg4ff_init(struct hid_device *hid)if (test_bit (FF_AUTOCENTER , dev->ffbit)) dev->ff->set_autocenter = hid_lg4ff_set_autocenter; -dev_info (&hid->dev,"Force feedback for Logitech Speed Force Wireless by " -"Simon Wood <[email protected]>\n" ); +hid_info (hid,"Force feedback for Logitech Speed Force Wireless by Simon Wood <[email protected]>\n" );return 0 ; }
drivers/hid/hid-lgff.c +5 -3
@@ -27,6 +27,8 @@* e-mail - mail your message to <[email protected]> */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/input.h> #include <linux/usb.h> #include <linux/hid.h>
@@ -146,7 +148,7 @@ int lgff_init(struct hid_device* hid)/* Find the report to use */ if (list_empty (report_list)) { -err_hid ("No output report found" ); +hid_err (hid,"No output report found\n" );return -1 ; }
@@ -154,7 +156,7 @@ int lgff_init(struct hid_device* hid) report = list_entry(report_list->next, struct hid_report, list); field = report->field[0 ];if (!field) { -err_hid ("NULL field" ); +hid_err (hid,"NULL field\n" );return -1 ; }
@@ -176,7 +178,7 @@ int lgff_init(struct hid_device* hid)if (test_bit (FF_AUTOCENTER , dev->ffbit) ) dev->ff->set_autocenter = hid_lgff_set_autocenter; -printk (KERN_INFO "Force feedback for Logitech force feedback devices by Johann Deneux <[email protected]>\n" ); +pr_info ("Force feedback for Logitech force feedback devices by Johann Deneux <[email protected]>\n" );return 0 ; }
drivers/hid/hid-magicmouse.c +8 -7
@@ -12,6 +12,8 @@* any later version. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#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 ) { -dev_err (&hdev->dev,"can't alloc magicmouse descriptor\n" ); +hid_err (hdev,"can't alloc magicmouse descriptor\n" );return -ENOMEM ; }
@@ -459,13 +461,13 @@ static int magicmouse_probe(struct hid_device *hdev, ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"magicmouse hid parse failed\n" ); +hid_err (hdev,"magicmouse hid parse failed\n" ); goto err_free; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT );if (ret) { -dev_err (&hdev->dev,"magicmouse hw start failed\n" ); +hid_err (hdev,"magicmouse hw start failed\n" ); goto err_free; }
@@ -486,7 +488,7 @@ static int magicmouse_probe(struct hid_device *hdev, }if (!report) { -dev_err (&hdev->dev,"unable to register touch report\n" ); +hid_err (hdev,"unable to register touch report\n" ); 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)) { -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; }
@@ -540,7 +541,7 @@ static int __init magicmouse_init(void) ret =hid_register_driver (&magicmouse_driver);if (ret) -printk (KERN_ERR "can't register magicmouse driver\n" ); +pr_err ("can't register magicmouse driver\n" );return ret; }
drivers/hid/hid-microsoft.c +3 -4
@@ -40,8 +40,7 @@ static __u8 *ms_report_fixup(struct hid_device *hdev, __u8 *rdesc,if ((quirks &MS_RDESC ) && *rsize ==571 && rdesc[557 ] ==0x19 && rdesc[559 ] ==0x29 ) { -dev_info (&hdev->dev,"fixing up Microsoft Wireless Receiver " -"Model 1028 report descriptor\n" ); +hid_info (hdev,"fixing up Microsoft Wireless Receiver Model 1028 report descriptor\n" ); rdesc[557 ] =0x35 ; rdesc[559 ] =0x45 ; }
@@ -155,14 +154,14 @@ static int ms_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err_free; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT | ((quirks &MS_HIDINPUT ) ?HID_CONNECT_HIDINPUT_FORCE :0 ));if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err_free; }
drivers/hid/hid-monterey.c +1 -2
@@ -26,8 +26,7 @@ static __u8 *mr_report_fixup(struct hid_device *hdev, __u8 *rdesc, unsigned int *rsize) {if (*rsize >=30 && rdesc[29 ] ==0x05 && rdesc[30 ] ==0x09 ) { -dev_info (&hdev->dev,"fixing up button/consumer in HID report " -"descriptor\n" ); +hid_info (hdev,"fixing up button/consumer in HID report descriptor\n" ); rdesc[30 ] =0x0c ; }return rdesc;
drivers/hid/hid-mosart.c +1 -1
@@ -199,7 +199,7 @@ static int mosart_probe(struct hid_device *hdev, const struct hid_device_id *id) td =kmalloc (sizeof (struct mosart_data ),GFP_KERNEL );if (!td) { -dev_err (&hdev->dev,"cannot allocate MosArt data\n" ); +hid_err (hdev,"cannot allocate MosArt data\n" );return -ENOMEM ; } td->valid = false;
drivers/hid/hid-ntrig.c +4 -5
@@ -130,8 +130,7 @@ static void ntrig_report_version(struct hid_device *hdev)if (ret ==8 ) { ret =ntrig_version_string (&data[2 ], buf); -dev_info (&hdev->dev, -"Firmware version: %s (%02x%02x %02x%02x)\n" , +hid_info (hdev,"Firmware version: %s (%02x%02x %02x%02x)\n" , buf, data[2 ], data[3 ], data[4 ], data[5 ]); }
@@ -831,7 +830,7 @@ static int ntrig_probe(struct hid_device *hdev, const struct hid_device_id *id) nd =kmalloc (sizeof (struct ntrig_data ),GFP_KERNEL );if (!nd) { -dev_err (&hdev->dev,"cannot allocate N-Trig data\n" ); +hid_err (hdev,"cannot allocate N-Trig data\n" );return -ENOMEM ; }
@@ -850,13 +849,13 @@ static int ntrig_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err_free; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT & ~HID_CONNECT_FF );if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err_free; }
drivers/hid/hid-ortek.c +1 -2
@@ -23,8 +23,7 @@ static __u8 *ortek_report_fixup(struct hid_device *hdev, __u8 *rdesc, unsigned int *rsize) {if (*rsize >=56 && rdesc[54 ] ==0x25 && rdesc[55 ] ==0x01 ) { -dev_info (&hdev->dev,"Fixing up Ortek WKB-2000 " -"report descriptor.\n" ); +hid_info (hdev,"Fixing up Ortek WKB-2000 report descriptor\n" ); rdesc[55 ] =0x92 ; }return rdesc;
drivers/hid/hid-petalynx.c +3 -4
@@ -29,8 +29,7 @@ static __u8 *pl_report_fixup(struct hid_device *hdev, __u8 *rdesc,if (*rsize >=60 && rdesc[39 ] ==0x2a && rdesc[40 ] ==0xf5 && rdesc[41 ] ==0x00 && rdesc[59 ] ==0x26 && rdesc[60 ] ==0xf9 && rdesc[61 ] ==0x00 ) { -dev_info (&hdev->dev,"fixing up Petalynx Maxter Remote report " -"descriptor\n" ); +hid_info (hdev,"fixing up Petalynx Maxter Remote report descriptor\n" ); rdesc[60 ] =0xfa ; rdesc[40 ] =0xfa ; }
@@ -77,13 +76,13 @@ static int pl_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err_free; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT );if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err_free; }
drivers/hid/hid-picolcd.c +21 -24
134 lines not on this page · raw message
drivers/hid/hid-pl.c +7 -9
@@ -103,7 +103,7 @@ static int plff_init(struct hid_device *hid)*/ if (list_empty (report_list)) { -dev_err (&hid->dev,"no output reports found\n" ); +hid_err (hid,"no output reports found\n" );return -ENODEV ; }
@@ -112,14 +112,13 @@ static int plff_init(struct hid_device *hid) report_ptr = report_ptr->next;if (report_ptr == report_list) { -dev_err (&hid->dev,"required output report is " -"missing\n" ); +hid_err (hid,"required output report is missing\n" );return -ENODEV ; } report = list_entry(report_ptr, struct hid_report, list);if (report->maxfield <1 ) { -dev_err (&hid->dev,"no fields in the report\n" ); +hid_err (hid,"no fields in the report\n" );return -ENODEV ; }
@@ -137,7 +136,7 @@ static int plff_init(struct hid_device *hid) weak = &report->field[3 ]->value[0 ];debug ("detected 4-field device" ); }else { -dev_err (&hid->dev,"not enough fields or values\n" ); +hid_err (hid,"not enough fields or values\n" );return -ENODEV ; }
@@ -164,8 +163,7 @@ static int plff_init(struct hid_device *hid)usbhid_submit_report (hid, plff->report,USB_DIR_OUT ); } -dev_info (&hid->dev,"Force feedback for PantherLord/GreenAsia " -"devices by Anssi Hannula <[email protected]>\n" ); +hid_info (hid,"Force feedback for PantherLord/GreenAsia devices by Anssi Hannula <[email protected]>\n" );return 0 ; }
@@ -185,13 +183,13 @@ static int pl_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT & ~HID_CONNECT_FF );if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err; }
drivers/hid/hid-prodikeys.c +11 -10
@@ -16,6 +16,8 @@* any later version. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/device.h> #include <linux/module.h> #include <linux/usb.h>
@@ -285,11 +287,11 @@ static int pcmidi_get_output_report(struct pcmidi_snd *pm)continue ;if (report->maxfield <1 ) { -dev_err (&hdev->dev,"output report is empty\n" ); +hid_err (hdev,"output report is empty\n" );break ; }if (report->field[0 ]->report_count !=2 ) { -dev_err (&hdev->dev,"field count too low\n" ); +hid_err (hdev,"field count too low\n" );break ; } pm->pcmidi_report6 = report;
@@ -746,8 +748,8 @@ static __u8 *pk_report_fixup(struct hid_device *hdev, __u8 *rdesc,if (*rsize ==178 && rdesc[111 ] ==0x06 && rdesc[112 ] ==0x00 && rdesc[113 ] ==0xff ) { -dev_info (&hdev->dev,"fixing up pc-midi keyboard report " -"descriptor\n" ); +hid_info (hdev, +"fixing up pc-midi keyboard report descriptor\n" ); rdesc[144 ] =0x18 ;/* report 4: was 0x10 report count */ }
@@ -805,7 +807,7 @@ static int pk_probe(struct hid_device *hdev, const struct hid_device_id *id) pk =kzalloc (sizeof (*pk),GFP_KERNEL );if (pk ==NULL ) { -dev_err (&hdev->dev,"prodikeys: can't alloc descriptor\n" ); +hid_err (hdev,"can't alloc descriptor\n" );return -ENOMEM ; }
@@ -813,8 +815,7 @@ static int pk_probe(struct hid_device *hdev, const struct hid_device_id *id) pm =kzalloc (sizeof (*pm),GFP_KERNEL );if (pm ==NULL ) { -dev_err (&hdev->dev, -"prodikeys: can't alloc descriptor\n" ); +hid_err (hdev,"can't alloc descriptor\n" ); ret = -ENOMEM ; goto err_free; }
@@ -827,7 +828,7 @@ static int pk_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"prodikeys: hid parse failed\n" ); +hid_err (hdev,"hid parse failed\n" ); goto err_free; }
@@ -837,7 +838,7 @@ static int pk_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT );if (ret) { -dev_err (&hdev->dev,"prodikeys: hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err_free; }
@@ -896,7 +897,7 @@ static int pk_init(void) ret =hid_register_driver (&pk_driver);if (ret) -printk (KERN_ERR "can't register prodikeys driver\n" ); +pr_err ("can't register prodikeys driver\n" );return ret; }
drivers/hid/hid-quanta.c +1 -1
@@ -195,7 +195,7 @@ static int quanta_probe(struct hid_device *hdev, const struct hid_device_id *id) td =kmalloc (sizeof (struct quanta_data ),GFP_KERNEL );if (!td) { -dev_err (&hdev->dev,"cannot allocate Quanta Touch data\n" ); +hid_err (hdev,"cannot allocate Quanta Touch data\n" );return -ENOMEM ; } td->valid = false;
drivers/hid/hid-roccat-kone.c +10 -12
@@ -90,8 +90,7 @@ static int kone_check_write(struct usb_device *usb_dev)kfree (data);return 0 ; }else {/* unknown answer */ -dev_err (&usb_dev->dev,"got retval %d when checking write\n" , - *data); +hid_err (usb_dev,"got retval %d when checking write\n" , *data);kfree (data);return -EIO ; }
@@ -556,7 +555,7 @@ static ssize_t kone_sysfs_set_tcu(struct device *dev, retval =kone_set_settings (usb_dev, &kone->settings);if (retval) { -dev_err (&usb_dev->dev,"couldn't set tcu state\n" ); +hid_err (usb_dev,"couldn't set tcu state\n" );/* * try to reread valid settings into buffer overwriting * first error code
@@ -570,7 +569,7 @@ static ssize_t kone_sysfs_set_tcu(struct device *dev, retval = size; exit_no_settings: -dev_err (&usb_dev->dev,"couldn't read settings\n" ); +hid_err (usb_dev,"couldn't read settings\n" ); exit_unlock:mutex_unlock (&kone->kone_lock);return retval;
@@ -818,21 +817,20 @@ static int kone_init_specials(struct hid_device *hdev) kone =kzalloc (sizeof (*kone),GFP_KERNEL );if (!kone) { -dev_err (&hdev->dev,"can't alloc device descriptor\n" ); +hid_err (hdev,"can't alloc device descriptor\n" );return -ENOMEM ; }hid_set_drvdata (hdev, kone); retval =kone_init_kone_device_struct (usb_dev, kone);if (retval) { -dev_err (&hdev->dev, -"couldn't init struct kone_device\n" ); +hid_err (hdev,"couldn't init struct kone_device\n" ); goto exit_free; } retval =roccat_connect (hdev);if (retval <0 ) { -dev_err (&hdev->dev,"couldn't init char dev\n" ); +hid_err (hdev,"couldn't init char dev\n" );/* be tolerant about not getting chrdev */ }else { kone->roccat_claimed =1 ;
@@ -841,7 +839,7 @@ static int kone_init_specials(struct hid_device *hdev) retval =kone_create_sysfs_attributes (intf);if (retval) { -dev_err (&hdev->dev,"cannot create sysfs files\n" ); +hid_err (hdev,"cannot create sysfs files\n" ); goto exit_free; } }else {
@@ -876,19 +874,19 @@ static int kone_probe(struct hid_device *hdev, const struct hid_device_id *id) retval =hid_parse (hdev);if (retval) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto exit; } retval =hid_hw_start (hdev,HID_CONNECT_DEFAULT );if (retval) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto exit; } retval =kone_init_specials (hdev);if (retval) { -dev_err (&hdev->dev,"couldn't install mouse\n" ); +hid_err (hdev,"couldn't install mouse\n" ); goto exit_stop; }
drivers/hid/hid-roccat-pyra.c +9 -11
@@ -87,9 +87,8 @@ static int pyra_receive_control_status(struct usb_device *usb_dev) control.value == 1) return 0; else { -dev_err (&usb_dev->dev,"receive control status: " -"unknown response 0x%x 0x%x\n" , - control.request, control.value); +hid_err (usb_dev,"receive control status: unknown response 0x%x 0x%x\n" , + control.request, control.value);return -EINVAL ; } }
@@ -770,21 +769,20 @@ static int pyra_init_specials(struct hid_device *hdev) pyra =kzalloc (sizeof (*pyra),GFP_KERNEL );if (!pyra) { -dev_err (&hdev->dev,"can't alloc device descriptor\n" ); +hid_err (hdev,"can't alloc device descriptor\n" );return -ENOMEM ; }hid_set_drvdata (hdev, pyra); retval =pyra_init_pyra_device_struct (usb_dev, pyra);if (retval) { -dev_err (&hdev->dev, -"couldn't init struct pyra_device\n" ); +hid_err (hdev,"couldn't init struct pyra_device\n" ); goto exit_free; } retval =roccat_connect (hdev);if (retval <0 ) { -dev_err (&hdev->dev,"couldn't init char dev\n" ); +hid_err (hdev,"couldn't init char dev\n" ); }else { pyra->chrdev_minor = retval; pyra->roccat_claimed =1 ;
@@ -792,7 +790,7 @@ static int pyra_init_specials(struct hid_device *hdev) retval =pyra_create_sysfs_attributes (intf);if (retval) { -dev_err (&hdev->dev,"cannot create sysfs files\n" ); +hid_err (hdev,"cannot create sysfs files\n" ); goto exit_free; } }else {
@@ -826,19 +824,19 @@ static int pyra_probe(struct hid_device *hdev, const struct hid_device_id *id) retval =hid_parse (hdev);if (retval) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto exit; } retval =hid_hw_start (hdev,HID_CONNECT_DEFAULT );if (retval) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto exit; } retval =pyra_init_specials (hdev);if (retval) { -dev_err (&hdev->dev,"couldn't install mouse\n" ); +hid_err (hdev,"couldn't install mouse\n" ); goto exit_stop; }return 0 ;
drivers/hid/hid-roccat.c +5 -5
@@ -21,6 +21,8 @@* It is inspired by hidraw, but uses only one circular buffer for all readers. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/cdev.h> #include <linux/poll.h> #include <linux/sched.h>
@@ -165,8 +167,7 @@ static int roccat_open(struct inode *inode, struct file *file)mutex_lock (&device->readers_lock);if (!device) { -printk (KERN_EMERG "roccat device with minor %d doesn't exist\n" , - minor); +pr_emerg ("roccat device with minor %d doesn't exist\n" , minor); error = -ENODEV ; goto exit_err; }
@@ -218,8 +219,7 @@ static int roccat_release(struct inode *inode, struct file *file) device = devices[minor];if (!device) {mutex_unlock (&devices_lock); -printk (KERN_EMERG "roccat device with minor %d doesn't exist\n" , - minor); +pr_emerg ("roccat device with minor %d doesn't exist\n" , minor);return -ENODEV ; }
@@ -398,7 +398,7 @@ static int __init roccat_init(void) roccat_major =MAJOR (dev_id);if (retval <0 ) { -printk (KERN_WARNING "roccat: can't get major number\n" ); +pr_warn ("can't get major number\n" );return retval; }
drivers/hid/hid-samsung.c +4 -4
@@ -57,8 +57,8 @@static inline void samsung_irda_dev_trace (struct hid_device *hdev,unsigned int rsize) { -dev_info (&hdev->dev,"fixing up Samsung IrDA %d byte report " -"descriptor\n" , rsize); +hid_info (hdev,"fixing up Samsung IrDA %d byte report descriptor\n" , + rsize); } static __u8 *samsung_irda_report_fixup(struct hid_device *hdev, __u8 *rdesc,
@@ -160,7 +160,7 @@ static int samsung_probe(struct hid_device *hdev, ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err_free; }
@@ -174,7 +174,7 @@ static int samsung_probe(struct hid_device *hdev, ret =hid_hw_start (hdev, cmask);if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err_free; }
drivers/hid/hid-sjoy.c +7 -9
@@ -74,26 +74,25 @@ static int sjoyff_init(struct hid_device *hid)int error;if (list_empty (report_list)) { -dev_err (&hid->dev,"no output reports found\n" ); +hid_err (hid,"no output reports found\n" );return -ENODEV ; } report_ptr = report_ptr->next;if (report_ptr == report_list) { -dev_err (&hid->dev,"required output report is " -"missing\n" ); +hid_err (hid,"required output report is missing\n" );return -ENODEV ; } report = list_entry(report_ptr, struct hid_report, list);if (report->maxfield <1 ) { -dev_err (&hid->dev,"no fields in the report\n" ); +hid_err (hid,"no fields in the report\n" );return -ENODEV ; }if (report->field[0 ]->report_count <3 ) { -dev_err (&hid->dev,"not enough values in the field\n" ); +hid_err (hid,"not enough values in the field\n" );return -ENODEV ; }
@@ -117,8 +116,7 @@ static int sjoyff_init(struct hid_device *hid) sjoyff->report->field[0 ]->value[2 ] =0x00 ;usbhid_submit_report (hid, sjoyff->report,USB_DIR_OUT ); -dev_info (&hid->dev, -"Force feedback for SmartJoy PLUS PS2/USB adapter\n" ); +hid_info (hid,"Force feedback for SmartJoy PLUS PS2/USB adapter\n" );return 0 ; }
@@ -135,13 +133,13 @@ static int sjoy_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT & ~HID_CONNECT_FF );if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err; }
drivers/hid/hid-sony.c +5 -6
@@ -40,8 +40,7 @@ static __u8 *sony_report_fixup(struct hid_device *hdev, __u8 *rdesc,if ((sc->quirks &VAIO_RDESC_CONSTANT ) && *rsize >=56 && rdesc[54 ] ==0x81 && rdesc[55 ] ==0x07 ) { -dev_info (&hdev->dev,"Fixing up Sony Vaio VGX report " -"descriptor\n" ); +hid_info (hdev,"Fixing up Sony Vaio VGX report descriptor\n" ); rdesc[55 ] =0x06 ; }return rdesc;
@@ -89,7 +88,7 @@ static int sixaxis_set_operational_usb(struct hid_device *hdev) (3 <<8 ) |0xf2 , ifnum, buf,17 , USB_CTRL_GET_TIMEOUT);if (ret <0 ) -dev_err (&hdev->dev,"can't set operational mode\n" ); +hid_err (hdev,"can't set operational mode\n" );kfree (buf);
@@ -110,7 +109,7 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id) sc =kzalloc (sizeof (*sc),GFP_KERNEL );if (sc ==NULL ) { -dev_err (&hdev->dev,"can't alloc sony descriptor\n" ); +hid_err (hdev,"can't alloc sony descriptor\n" );return -ENOMEM ; }
@@ -119,14 +118,14 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err_free; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT |HID_CONNECT_HIDDEV_FORCE );if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err_free; }
drivers/hid/hid-stantum.c +1 -1
@@ -222,7 +222,7 @@ static int stantum_probe(struct hid_device *hdev, sd =kmalloc (sizeof (struct stantum_data ),GFP_KERNEL );if (!sd) { -dev_err (&hdev->dev,"cannot allocate Stantum data\n" ); +hid_err (hdev,"cannot allocate Stantum data\n" );return -ENOMEM ; } sd->valid = false;
drivers/hid/hid-sunplus.c +1 -2
@@ -27,8 +27,7 @@ static __u8 *sp_report_fixup(struct hid_device *hdev, __u8 *rdesc, {if (*rsize >=107 && rdesc[104 ] ==0x26 && rdesc[105 ] ==0x80 && rdesc[106 ] ==0x03 ) { -dev_info (&hdev->dev,"fixing up Sunplus Wireless Desktop " -"report descriptor\n" ); +hid_info (hdev,"fixing up Sunplus Wireless Desktop report descriptor\n" ); rdesc[105 ] = rdesc[110 ] =0x03 ; rdesc[106 ] = rdesc[111 ] =0x21 ; }
drivers/hid/hid-tmff.c +10 -17
@@ -151,28 +151,23 @@ static int tmff_init(struct hid_device *hid, const signed short *ff_bits)switch (field->usage[0 ].hid) {case THRUSTMASTER_USAGE_FF :if (field->report_count <2 ) { -dev_warn (&hid->dev,"ignoring FF field " -"with report_count < 2\n" ); +hid_warn (hid,"ignoring FF field with report_count < 2\n" );continue ; }if (field->logical_maximum == field->logical_minimum) { -dev_warn (&hid->dev,"ignoring FF field " -"with logical_maximum " -"== logical_minimum\n" ); +hid_warn (hid,"ignoring FF field with logical_maximum == logical_minimum\n" );continue ; }if (tmff->report && tmff->report != report) { -dev_warn (&hid->dev,"ignoring FF field " -"in other report\n" ); +hid_warn (hid,"ignoring FF field in other report\n" );continue ; }if (tmff->ff_field && tmff->ff_field != field) { -dev_warn (&hid->dev,"ignoring " -"duplicate FF field\n" ); +hid_warn (hid,"ignoring duplicate FF field\n" );continue ; }
@@ -185,16 +180,15 @@ static int tmff_init(struct hid_device *hid, const signed short *ff_bits)break ;default : -dev_warn (&hid->dev,"ignoring unknown output " -"usage %08x\n" , - field->usage[0 ].hid); +hid_warn (hid,"ignoring unknown output usage %08x\n" , + field->usage[0 ].hid);continue ; } } }if (!tmff->report) { -dev_err (&hid->dev,"can't find FF field in output reports\n" ); +hid_err (hid,"can't find FF field in output reports\n" ); error = -ENODEV ; goto fail; }
@@ -203,8 +197,7 @@ static int tmff_init(struct hid_device *hid, const signed short *ff_bits)if (error) goto fail; -dev_info (&hid->dev,"force feedback for ThrustMaster devices by Zinx " -"Verituse <[email protected]>" ); +hid_info (hid,"force feedback for ThrustMaster devices by Zinx Verituse <[email protected]>\n" );return 0 ; fail:
@@ -224,13 +217,13 @@ static int tm_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT & ~HID_CONNECT_FF );if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err; }
drivers/hid/hid-wacom.c +14 -12
@@ -18,6 +18,8 @@* any later version. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/device.h> #include <linux/hid.h> #include <linux/module.h>
@@ -141,8 +143,8 @@ static void wacom_poke(struct hid_device *hdev, u8 speed)* Note that if the raw queries fail, it's not a hard failure and it * is safe to continue */ -dev_warn (&hdev->dev,"failed to poke device, command %d, err %d\n" , - rep_data[0 ], ret); +hid_warn (hdev,"failed to poke device, command %d, err %d\n" , + rep_data[0 ], ret);return ; }
@@ -312,7 +314,7 @@ static int wacom_probe(struct hid_device *hdev, wdata =kzalloc (sizeof (*wdata),GFP_KERNEL );if (wdata ==NULL ) { -dev_err (&hdev->dev,"can't alloc wacom descriptor\n" ); +hid_err (hdev,"can't alloc wacom descriptor\n" );return -ENOMEM ; }
@@ -321,20 +323,20 @@ static int wacom_probe(struct hid_device *hdev,/* Parse the HID report now */ ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err_free; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT );if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err_free; } ret =device_create_file (&hdev->dev, &dev_attr_speed);if (ret) -dev_warn (&hdev->dev, -"can't create sysfs speed attribute err: %d\n" , ret); +hid_warn (hdev, +"can't create sysfs speed attribute err: %d\n" , ret);/* Set Wacom mode 2 with high reporting speed */ wacom_poke (hdev,1 );
@@ -349,8 +351,8 @@ static int wacom_probe(struct hid_device *hdev, ret =power_supply_register (&hdev->dev, &wdata->battery);if (ret) { -dev_warn (&hdev->dev, -"can't create sysfs battery attribute, err: %d\n" , ret); +hid_warn (hdev,"can't create sysfs battery attribute, err: %d\n" , + ret);/* * battery attribute is not critical for the tablet, but if it * failed then there is no need to create ac attribute
@@ -367,8 +369,8 @@ static int wacom_probe(struct hid_device *hdev, ret =power_supply_register (&hdev->dev, &wdata->ac);if (ret) { -dev_warn (&hdev->dev, -"can't create ac battery attribute, err: %d\n" , ret); +hid_warn (hdev, +"can't create ac battery attribute, err: %d\n" , ret);/* * ac attribute is not critical for the tablet, but if it * failed then we don't want to battery attribute to exist
@@ -454,7 +456,7 @@ static int __init wacom_init(void) ret =hid_register_driver (&wacom_driver);if (ret) -printk (KERN_ERR "can't register wacom driver\n" ); +pr_err ("can't register wacom driver\n" );return ret; }
drivers/hid/hid-zpff.c +5 -6
@@ -75,14 +75,14 @@ static int zpff_init(struct hid_device *hid)int error;if (list_empty (report_list)) { -dev_err (&hid->dev,"no output report found\n" ); +hid_err (hid,"no output report found\n" );return -ENODEV ; } report = list_entry(report_list->next, struct hid_report, list);if (report->maxfield <4 ) { -dev_err (&hid->dev,"not enough fields in report\n" ); +hid_err (hid,"not enough fields in report\n" );return -ENODEV ; }
@@ -105,8 +105,7 @@ static int zpff_init(struct hid_device *hid) zpff->report->field[3 ]->value[0 ] =0x00 ;usbhid_submit_report (hid, zpff->report,USB_DIR_OUT ); -dev_info (&hid->dev,"force feedback for Zeroplus based devices by " -"Anssi Hannula <[email protected]>\n" ); +hid_info (hid,"force feedback for Zeroplus based devices by Anssi Hannula <[email protected]>\n" );return 0 ; }
@@ -123,13 +122,13 @@ static int zp_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT & ~HID_CONNECT_FF );if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err; }
drivers/hid/hid-zydacron.c +5 -6
@@ -34,9 +34,8 @@ static __u8 *zc_report_fixup(struct hid_device *hdev, __u8 *rdesc, rdesc[0x96] == 0xbc && rdesc[0x97] == 0xff && rdesc[0xca] == 0xbc && rdesc[0xcb] == 0xff && rdesc[0xe1] == 0xbc && rdesc[0xe2] == 0xff) { -dev_info (&hdev->dev, -"fixing up zydacron remote control report " -"descriptor\n" ); +hid_info (hdev, +"fixing up zydacron remote control report descriptor\n" ); rdesc[0x96 ] = rdesc[0xca ] = rdesc[0xe1 ] =0x0c ; rdesc[0x97 ] = rdesc[0xcb ] = rdesc[0xe2 ] =0x00 ; }
@@ -172,7 +171,7 @@ static int zc_probe(struct hid_device *hdev, const struct hid_device_id *id) zc =kzalloc (sizeof (*zc),GFP_KERNEL );if (zc ==NULL ) { -dev_err (&hdev->dev,"zydacron: can't alloc descriptor\n" ); +hid_err (hdev,"can't alloc descriptor\n" );return -ENOMEM ; }
@@ -180,13 +179,13 @@ static int zc_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"zydacron: parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err_free; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT );if (ret) { -dev_err (&hdev->dev,"zydacron: hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err_free; }
drivers/hid/hidraw.c +7 -5
@@ -19,6 +19,8 @@* 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/fs.h> #include <linux/module.h> #include <linux/errno.h>
@@ -122,15 +124,15 @@ static ssize_t hidraw_write(struct file *file, const char __user *buffer, size_t }if (count >HID_MAX_BUFFER_SIZE ) { -printk (KERN_WARNING "hidraw: pid %d passed too large report\n" , -task_pid_nr (current)); +hid_warn (dev,"pid %d passed too large report\n" , +task_pid_nr (current)); ret = -EINVAL ; goto out; }if (count <2 ) { -printk (KERN_WARNING "hidraw: pid %d passed too short report\n" , -task_pid_nr (current)); +hid_warn (dev,"pid %d passed too short report\n" , +task_pid_nr (current)); ret = -EINVAL ; goto out; }
@@ -452,7 +454,7 @@ int __init hidraw_init(void) hidraw_major =MAJOR (dev_id);if (result <0 ) { -printk (KERN_WARNING "hidraw: can't get major number\n" ); +pr_warn ("can't get major number\n" ); result =0 ; goto out; }
drivers/hid/usbhid/hid-core.c +23 -25
137 lines not on this page · raw message
drivers/hid/usbhid/hid-pidff.c +83 -90
457 lines not on this page · raw message
drivers/hid/usbhid/hiddev.c +1 -1
@@ -892,7 +892,7 @@ int hiddev_connect(struct hid_device *hid, unsigned int force) hiddev->exist =1 ; retval =usb_register_dev (usbhid->intf, &hiddev_class);if (retval) { -err_hid ("Not able to get a minor for this device." ); +hid_err (hid,"Not able to get a minor for this device\n" ); hid->hiddev =NULL ;kfree (hiddev);return -1 ;
drivers/hid/usbhid/usbkbd.c +12 -10
@@ -24,6 +24,8 @@* Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/kernel.h> #include <linux/slab.h> #include <linux/module.h>
@@ -104,16 +106,16 @@ static void usb_kbd_irq(struct urb *urb)if (usb_kbd_keycode[kbd->old[i]])input_report_key (kbd->dev, usb_kbd_keycode[kbd->old[i]],0 );else -dev_info (&urb->dev->dev, -"Unknown key (scancode %#x) released.\n" , kbd->old[i]); +hid_info (urb->dev, +"Unknown key (scancode %#x) released.\n" , kbd->old[i]); }if (kbd->new[i] >3 &&memscan (kbd->old +2 , kbd->new[i],6 ) == kbd->old +8 ) {if (usb_kbd_keycode[kbd->new[i]])input_report_key (kbd->dev, usb_kbd_keycode[kbd->new[i]],1 );else -dev_info (&urb->dev->dev, -"Unknown key (scancode %#x) released.\n" , kbd->new[i]); +hid_info (urb->dev, +"Unknown key (scancode %#x) released.\n" , kbd->new[i]); } }
@@ -124,9 +126,9 @@ static void usb_kbd_irq(struct urb *urb) resubmit: i =usb_submit_urb (urb,GFP_ATOMIC );if (i) -err_hid ("can't resubmit intr, %s-%s/input0, status %d" , - kbd->usbdev->bus->bus_name, - kbd->usbdev->devpath, i); +hid_err (urb->dev,"can't resubmit intr, %s-%s/input0, status %d" , + kbd->usbdev->bus->bus_name, + kbd->usbdev->devpath, i); } static int usb_kbd_event(struct input_dev *dev, unsigned int type,
@@ -150,7 +152,7 @@ static int usb_kbd_event(struct input_dev *dev, unsigned int type, *(kbd->leds) = kbd->newleds; kbd->led->dev = kbd->usbdev;if (usb_submit_urb (kbd->led,GFP_ATOMIC )) -err_hid ("usb_submit_urb(leds) failed" ); +pr_err ("usb_submit_urb(leds) failed\n" );return 0 ; }
@@ -160,7 +162,7 @@ static void usb_kbd_led(struct urb *urb)struct usb_kbd *kbd = urb->context;if (urb->status) -dev_warn (&urb->dev->dev,"led urb status %d received\n" , +hid_warn (urb->dev,"led urb status %d received\n" , urb->status);if (*(kbd->leds) == kbd->newleds)
@@ -169,7 +171,7 @@ static void usb_kbd_led(struct urb *urb) *(kbd->leds) = kbd->newleds; kbd->led->dev = kbd->usbdev;if (usb_submit_urb (kbd->led,GFP_ATOMIC )) -err_hid ("usb_submit_urb(leds) failed" ); +hid_err (urb->dev,"usb_submit_urb(leds) failed\n" ); }static int usb_kbd_open (struct input_dev *dev)
include/linux/hid.h +26 -6
@@ -838,12 +838,32 @@ int hid_pidff_init(struct hid_device *hid);#define hid_pidff_init NULL#endif -#define dbg_hid(format, arg...) if (hid_debug) \ - printk(KERN_DEBUG "%s: " format ,\ - __FILE__ , ## arg) -#define err_hid(format, arg...) printk(KERN_ERR "%s: " format "\n" , \ - __FILE__ , ## arg) -#endif /* HID_FF */ +#define dbg_hid(format, arg...) \ +do { \ + if (hid_debug) \ + printk(KERN_DEBUG "%s: " format, __FILE__, ##arg); \ +} while (0) + +#define hid_printk(level, hid, fmt, arg...) \ + dev_printk(level, &(hid)->dev, fmt, ##arg) +#define hid_emerg(hid, fmt, arg...) \ + dev_emerg(&(hid)->dev, fmt, ##arg) +#define hid_crit(hid, fmt, arg...) \ + dev_crit(&(hid)->dev, fmt, ##arg) +#define hid_alert(hid, fmt, arg...) \ + dev_alert(&(hid)->dev, fmt, ##arg) +#define hid_err(hid, fmt, arg...) \ + dev_err(&(hid)->dev, fmt, ##arg) +#define hid_notice(hid, fmt, arg...) \ + dev_notice(&(hid)->dev, fmt, ##arg) +#define hid_warn(hid, fmt, arg...) \ + dev_warn(&(hid)->dev, fmt, ##arg) +#define hid_info(hid, fmt, arg...) \ + dev_info(&(hid)->dev, fmt, ##arg) +#define hid_dbg(hid, fmt, arg...) \ + dev_dbg(&(hid)->dev, fmt, ##arg) + +#endif /* __KERNEL__ */ #endif
Re: [PATCH] hid: Add and use hid_<level>: dev_<level> equivalents
Quoted 13 lines · Joe Perches
Neaten current uses of dev_<level> by adding and using hid specific hid_<level> macros.
Convert existing uses of dev_<level> uses to hid_<level>. Convert hid-pidff printk to use hid_<level>.
Remove
err_hidand usehid_errinstead.Add missing newlines to logging messages where necessary. Coalesce format strings.
Add and use
pr_fmt(fmt)KBUILD_MODNAME": " fmt
Quoted 7 lines
Other miscellaneous changes:
Convert vmalloc/memset to vzalloc
Remove unnecessary__inline_from some static functions. Add const structhid_device* as argument to some functions so hid_<level> can be used as appropriate.
Remove unnecessary multiplies in inner loops, use += instead.
Hi Joe,
even though these are purely cleanup changes, I'd like to have them separated (or at least have more appropriate Subject: line for the commit).
Would you care to split that up?
Thanks,
Signature · 2 lines
Jiri Kosina SUSE Labs, Novell Inc.
cover hid: Use hid_<level> for logging messages
and a few miscellaneous cleanups while at it.
Joe Perches (6):
hid: Add and use hid_<level>: dev_<level> equivalents
hid: Use vzalloc for vmalloc/memset(,0...)
hid: Remove __inline__ from functions
hid: Remove unnecessary multiplies from loops
hid: Hoist assigns from ifs
hid: Simplify an index check in hid_lookup_collection
drivers/hid/hid-3m-pct.c | 2 +- drivers/hid/hid-a4tech.c | 6 +- drivers/hid/hid-apple.c | 14 ++-- drivers/hid/hid-axff.c | 14 ++-- drivers/hid/hid-belkin.c | 4 +- drivers/hid/hid-cando.c | 2 +- drivers/hid/hid-cherry.c | 3 +- drivers/hid/hid-core.c | 126 +++++++++++++++++++------------ drivers/hid/hid-cypress.c | 4 +- drivers/hid/hid-debug.c | 4 +- drivers/hid/hid-drff.c | 14 ++-- drivers/hid/hid-egalax.c | 2 +- drivers/hid/hid-elecom.c | 3 +- drivers/hid/hid-emsff.c | 13 ++-- drivers/hid/hid-gaff.c | 13 ++-- drivers/hid/hid-input.c | 2 +- drivers/hid/hid-kye.c | 4 +- drivers/hid/hid-lg.c | 15 ++-- drivers/hid/hid-lg2ff.c | 9 +- drivers/hid/hid-lg3ff.c | 9 +- drivers/hid/hid-lg4ff.c | 9 +- drivers/hid/hid-lgff.c | 8 +- drivers/hid/hid-magicmouse.c | 15 ++-- drivers/hid/hid-microsoft.c | 7 +- drivers/hid/hid-monterey.c | 3 +- drivers/hid/hid-mosart.c | 2 +- drivers/hid/hid-ntrig.c | 9 +- drivers/hid/hid-ortek.c | 3 +- drivers/hid/hid-petalynx.c | 7 +- drivers/hid/hid-picolcd.c | 45 +++++------ drivers/hid/hid-pl.c | 16 ++-- drivers/hid/hid-prodikeys.c | 21 +++--- drivers/hid/hid-quanta.c | 2 +- drivers/hid/hid-roccat-kone.c | 22 +++--- drivers/hid/hid-roccat-pyra.c | 20 ++--- drivers/hid/hid-roccat.c | 10 +- drivers/hid/hid-samsung.c | 8 +- drivers/hid/hid-sjoy.c | 16 ++-- drivers/hid/hid-sony.c | 11 +-- drivers/hid/hid-stantum.c | 2 +- drivers/hid/hid-sunplus.c | 3 +- drivers/hid/hid-tmff.c | 27 +++---- drivers/hid/hid-wacom.c | 26 ++++--- drivers/hid/hid-zpff.c | 11 +-- drivers/hid/hid-zydacron.c | 11 +-- drivers/hid/hidraw.c | 12 ++- drivers/hid/usbhid/hid-core.c | 48 ++++++------ drivers/hid/usbhid/hid-pidff.c | 164 +++++++++++++++++++--------------------- drivers/hid/usbhid/hiddev.c | 2 +- drivers/hid/usbhid/usbkbd.c | 24 ++++--- include/linux/hid.h | 32 ++++++-- 51 files changed, 438 insertions(+), 421 deletions(-)
Signature · 6 lines
1.7.3.3.464.gf80b6 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 1/6 hid: Add and use hid_<level>: dev_<level> equivalents
In reply to Jiri KosinaNeaten current uses of dev_<level> by adding and using hid specific hid_<level> macros.
Convert existing uses of dev_<level> uses to hid_<level>. Convert hid-pidff printk uses to hid_<level>.
Remove err_hid and use hid_err instead.
Add missing newlines to logging messages where necessary. Coalesce format strings.
Add and use pr_fmt(fmt) KBUILD_MODNAME ": " fmt
Other miscellaneous changes:
Add const struct hid_device * argument to hid-core functions extract() and implement() so hid_<level> can be used by them. Fix bad indentation in hid-core hid_input_field function that calls extract() function above.
--- drivers/hid/hid-3m-pct.c | 2 +- drivers/hid/hid-a4tech.c | 6 +- drivers/hid/hid-apple.c | 14 ++-- drivers/hid/hid-axff.c | 14 ++-- drivers/hid/hid-belkin.c | 4 +- drivers/hid/hid-cando.c | 2 +- drivers/hid/hid-cherry.c | 3 +- drivers/hid/hid-core.c | 64 +++++++++------- drivers/hid/hid-cypress.c | 4 +- drivers/hid/hid-debug.c | 4 +- drivers/hid/hid-drff.c | 14 ++-- drivers/hid/hid-egalax.c | 2 +- drivers/hid/hid-elecom.c | 3 +- drivers/hid/hid-emsff.c | 13 ++-- drivers/hid/hid-gaff.c | 13 ++-- drivers/hid/hid-input.c | 2 +- drivers/hid/hid-kye.c | 4 +- drivers/hid/hid-lg.c | 15 ++-- drivers/hid/hid-lg2ff.c | 9 +- drivers/hid/hid-lg3ff.c | 9 +- drivers/hid/hid-lg4ff.c | 9 +- drivers/hid/hid-lgff.c | 8 +- drivers/hid/hid-magicmouse.c | 15 ++-- drivers/hid/hid-microsoft.c | 7 +- drivers/hid/hid-monterey.c | 3 +- drivers/hid/hid-mosart.c | 2 +- drivers/hid/hid-ntrig.c | 9 +- drivers/hid/hid-ortek.c | 3 +- drivers/hid/hid-petalynx.c | 7 +- drivers/hid/hid-picolcd.c | 45 +++++------ drivers/hid/hid-pl.c | 16 ++-- drivers/hid/hid-prodikeys.c | 21 +++--- drivers/hid/hid-quanta.c | 2 +- drivers/hid/hid-roccat-kone.c | 22 +++--- drivers/hid/hid-roccat-pyra.c | 20 ++--- drivers/hid/hid-roccat.c | 10 +- drivers/hid/hid-samsung.c | 8 +- drivers/hid/hid-sjoy.c | 16 ++-- drivers/hid/hid-sony.c | 11 +-- drivers/hid/hid-stantum.c | 2 +- drivers/hid/hid-sunplus.c | 3 +- drivers/hid/hid-tmff.c | 27 +++---- drivers/hid/hid-wacom.c | 26 ++++--- drivers/hid/hid-zpff.c | 11 +-- drivers/hid/hid-zydacron.c | 11 +-- drivers/hid/hidraw.c | 12 ++- drivers/hid/usbhid/hid-core.c | 48 ++++++------ drivers/hid/usbhid/hid-pidff.c | 164 +++++++++++++++++++--------------------- drivers/hid/usbhid/hiddev.c | 2 +- drivers/hid/usbhid/usbkbd.c | 24 ++++--- include/linux/hid.h | 32 ++++++-- 51 files changed, 398 insertions(+), 399 deletions(-)
drivers/hid/hid-3m-pct.c +1 -1
@@ -274,7 +274,7 @@ static int mmm_probe(struct hid_device *hdev, const struct hid_device_id *id) md =kzalloc (sizeof (struct mmm_data ),GFP_KERNEL );if (!md) { -dev_err (&hdev->dev,"cannot allocate 3M data\n" ); +hid_err (hdev,"cannot allocate 3M data\n" );return -ENOMEM ; }hid_set_drvdata (hdev, md);
drivers/hid/hid-a4tech.c +3 -3
@@ -93,7 +93,7 @@ static int a4_probe(struct hid_device *hdev, const struct hid_device_id *id) a4 =kzalloc (sizeof (*a4),GFP_KERNEL );if (a4 ==NULL ) { -dev_err (&hdev->dev,"can't alloc device descriptor\n" ); +hid_err (hdev,"can't alloc device descriptor\n" ); ret = -ENOMEM ; goto err_free; }
@@ -104,13 +104,13 @@ static int a4_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err_free; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT );if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err_free; }
drivers/hid/hid-apple.c +8 -6
@@ -16,6 +16,8 @@* any later version. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/device.h> #include <linux/hid.h> #include <linux/module.h>
@@ -280,8 +282,8 @@ static __u8 *apple_report_fixup(struct hid_device *hdev, __u8 *rdesc,if ((asc->quirks &APPLE_RDESC_JIS ) && *rsize >=60 && rdesc[53 ] ==0x65 && rdesc[59 ] ==0x65 ) { -dev_info (&hdev->dev,"fixing up MacBook JIS keyboard report " -"descriptor\n" ); +hid_info (hdev, +"fixing up MacBook JIS keyboard report descriptor\n" ); rdesc[53 ] = rdesc[59 ] =0xe7 ; }return rdesc;
@@ -351,7 +353,7 @@ static int apple_probe(struct hid_device *hdev, asc =kzalloc (sizeof (*asc),GFP_KERNEL );if (asc ==NULL ) { -dev_err (&hdev->dev,"can't alloc apple descriptor\n" ); +hid_err (hdev,"can't alloc apple descriptor\n" );return -ENOMEM ; }
@@ -361,7 +363,7 @@ static int apple_probe(struct hid_device *hdev, ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err_free; }
@@ -372,7 +374,7 @@ static int apple_probe(struct hid_device *hdev, ret =hid_hw_start (hdev, connect_mask);if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err_free; }
@@ -512,7 +514,7 @@ static int __init apple_init(void) ret =hid_register_driver (&apple_driver);if (ret) -printk (KERN_ERR "can't register apple driver\n" ); +pr_err ("can't register apple driver\n" );return ret; }
drivers/hid/hid-axff.c +7 -7
@@ -73,14 +73,14 @@ static int axff_init(struct hid_device *hid)int error;if (list_empty (report_list)) { -dev_err (&hid->dev,"no output reports found\n" ); +hid_err (hid,"no output reports found\n" );return -ENODEV ; } report = list_first_entry(report_list, struct hid_report, list);if (report->maxfield <4 ) { -dev_err (&hid->dev,"no fields in the report: %d\n" , report->maxfield); +hid_err (hid,"no fields in the report: %d\n" , report->maxfield);return -ENODEV ; }
@@ -101,7 +101,7 @@ static int axff_init(struct hid_device *hid) axff->report->field[3 ]->value[0 ] =0x00 ;usbhid_submit_report (hid, axff->report,USB_DIR_OUT ); -dev_info (&hid->dev,"Force Feedback for ACRUX game controllers by Sergei Kolzun<[email protected]>\n" ); +hid_info (hid,"Force Feedback for ACRUX game controllers by Sergei Kolzun<[email protected]>\n" );return 0 ;
@@ -114,17 +114,17 @@ static int ax_probe(struct hid_device *hdev, const struct hid_device_id *id) {int error; -dev_dbg (&hdev->dev,"ACRUX HID hardware probe..." ); +dev_dbg (&hdev->dev,"ACRUX HID hardware probe...\n" ); error =hid_parse (hdev);if (error) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" );return error; } error =hid_hw_start (hdev,HID_CONNECT_DEFAULT & ~HID_CONNECT_FF );if (error) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" );return error; }
@@ -134,7 +134,7 @@ static int ax_probe(struct hid_device *hdev, const struct hid_device_id *id)* Do not fail device initialization completely as device * may still be partially operable, just warn. */ -dev_warn (&hdev->dev, +hid_warn (hdev,"Failed to enable force feedback support, error: %d\n" , error); }
drivers/hid/hid-belkin.c +2 -2
@@ -56,14 +56,14 @@ static int belkin_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err_free; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT | ((quirks &BELKIN_HIDDEV ) ?HID_CONNECT_HIDDEV_FORCE :0 ));if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err_free; }
drivers/hid/hid-cando.c +1 -1
@@ -207,7 +207,7 @@ static int cando_probe(struct hid_device *hdev, const struct hid_device_id *id) td =kmalloc (sizeof (struct cando_data ),GFP_KERNEL );if (!td) { -dev_err (&hdev->dev,"cannot allocate Cando Touch data\n" ); +hid_err (hdev,"cannot allocate Cando Touch data\n" );return -ENOMEM ; }hid_set_drvdata (hdev, td);
drivers/hid/hid-cherry.c +1 -2
@@ -30,8 +30,7 @@ static __u8 *ch_report_fixup(struct hid_device *hdev, __u8 *rdesc, unsigned int *rsize) {if (*rsize >=17 && rdesc[11 ] ==0x3c && rdesc[12 ] ==0x02 ) { -dev_info (&hdev->dev,"fixing up Cherry Cymotion report " -"descriptor\n" ); +hid_info (hdev,"fixing up Cherry Cymotion report descriptor\n" ); rdesc[11 ] = rdesc[16 ] =0xff ; rdesc[12 ] = rdesc[17 ] =0x03 ; }
drivers/hid/hid-core.c +37 -27
146 lines not on this page · raw message
drivers/hid/hid-cypress.c +2 -2
@@ -107,13 +107,13 @@ static int cp_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err_free; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT );if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err_free; }
drivers/hid/hid-debug.c +3 -1
@@ -26,6 +26,8 @@* Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/debugfs.h> #include <linux/seq_file.h> #include <linux/sched.h>
@@ -393,7 +395,7 @@ char *hid_resolv_usage(unsigned usage, struct seq_file *f) { buf =resolv_usage_page (usage >>16 , f);if (IS_ERR (buf)) { -printk (KERN_ERR "error allocating HID debug buffer\n" ); +pr_err ("error allocating HID debug buffer\n" );return NULL ; }
drivers/hid/hid-drff.c +7 -7
@@ -96,18 +96,18 @@ static int drff_init(struct hid_device *hid)int error;if (list_empty (report_list)) { -dev_err (&hid->dev,"no output reports found\n" ); +hid_err (hid,"no output reports found\n" );return -ENODEV ; } report = list_first_entry(report_list, struct hid_report, list);if (report->maxfield <1 ) { -dev_err (&hid->dev,"no fields in the report\n" ); +hid_err (hid,"no fields in the report\n" );return -ENODEV ; }if (report->field[0 ]->report_count <7 ) { -dev_err (&hid->dev,"not enough values in the field\n" ); +hid_err (hid,"not enough values in the field\n" );return -ENODEV ; }
@@ -133,8 +133,8 @@ static int drff_init(struct hid_device *hid) drff->report->field[0 ]->value[6 ] =0x00 ;usbhid_submit_report (hid, drff->report,USB_DIR_OUT ); -dev_info (&hid->dev,"Force Feedback for DragonRise Inc. game " -"controllers by Richard Walmsley <[email protected]>\n" ); +hid_info (hid,"Force Feedback for DragonRise Inc. " +"game controllers by Richard Walmsley <[email protected]>\n" );return 0 ; }
@@ -153,13 +153,13 @@ static int dr_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT & ~HID_CONNECT_FF );if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err; }
drivers/hid/hid-egalax.c +1 -1
@@ -223,7 +223,7 @@ static int egalax_probe(struct hid_device *hdev, const struct hid_device_id *id) td =kzalloc (sizeof (struct egalax_data ),GFP_KERNEL );if (!td) { -dev_err (&hdev->dev,"cannot allocate eGalax data\n" ); +hid_err (hdev,"cannot allocate eGalax data\n" );return -ENOMEM ; }hid_set_drvdata (hdev, td);
drivers/hid/hid-elecom.c +1 -2
@@ -24,8 +24,7 @@ static __u8 *elecom_report_fixup(struct hid_device *hdev, __u8 *rdesc, unsigned int *rsize) {if (*rsize >=48 && rdesc[46 ] ==0x05 && rdesc[47 ] ==0x0c ) { -dev_info (&hdev->dev,"Fixing up Elecom BM084 " -"report descriptor.\n" ); +hid_info (hdev,"Fixing up Elecom BM084 report descriptor\n" ); rdesc[47 ] =0x00 ; }return rdesc;
drivers/hid/hid-emsff.c +6 -7
@@ -68,18 +68,18 @@ static int emsff_init(struct hid_device *hid)int error;if (list_empty (report_list)) { -dev_err (&hid->dev,"no output reports found\n" ); +hid_err (hid,"no output reports found\n" );return -ENODEV ; } report = list_first_entry(report_list, struct hid_report, list);if (report->maxfield <1 ) { -dev_err (&hid->dev,"no fields in the report\n" ); +hid_err (hid,"no fields in the report\n" );return -ENODEV ; }if (report->field[0 ]->report_count <7 ) { -dev_err (&hid->dev,"not enough values in the field\n" ); +hid_err (hid,"not enough values in the field\n" );return -ENODEV ; }
@@ -105,8 +105,7 @@ static int emsff_init(struct hid_device *hid) emsff->report->field[0 ]->value[6 ] =0x00 ;usbhid_submit_report (hid, emsff->report,USB_DIR_OUT ); -dev_info (&hid->dev,"force feedback for EMS based devices by " -"Ignaz Forster <[email protected]>\n" ); +hid_info (hid,"force feedback for EMS based devices by Ignaz Forster <[email protected]>\n" );return 0 ; }
@@ -117,13 +116,13 @@ static int ems_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT & ~HID_CONNECT_FF );if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err; }
drivers/hid/hid-gaff.c +6 -7
@@ -87,7 +87,7 @@ static int gaff_init(struct hid_device *hid)int error;if (list_empty (report_list)) { -dev_err (&hid->dev,"no output reports found\n" ); +hid_err (hid,"no output reports found\n" );return -ENODEV ; }
@@ -95,12 +95,12 @@ static int gaff_init(struct hid_device *hid) report = list_entry(report_ptr, struct hid_report, list);if (report->maxfield <1 ) { -dev_err (&hid->dev,"no fields in the report\n" ); +hid_err (hid,"no fields in the report\n" );return -ENODEV ; }if (report->field[0 ]->report_count <6 ) { -dev_err (&hid->dev,"not enough values in the field\n" ); +hid_err (hid,"not enough values in the field\n" );return -ENODEV ; }
@@ -128,8 +128,7 @@ static int gaff_init(struct hid_device *hid)usbhid_submit_report (hid, gaff->report,USB_DIR_OUT ); -dev_info (&hid->dev,"Force Feedback for GreenAsia 0x12" -" devices by Lukasz Lubojanski <[email protected]>\n" ); +hid_info (hid,"Force Feedback for GreenAsia 0x12 devices by Lukasz Lubojanski <[email protected]>\n" );return 0 ; }
@@ -148,13 +147,13 @@ static int ga_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT & ~HID_CONNECT_FF );if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err; }
drivers/hid/hid-input.c +1 -1
@@ -871,7 +871,7 @@ int hidinput_connect(struct hid_device *hid, unsigned int force)if (!hidinput || !input_dev) {kfree (hidinput);input_free_device (input_dev); -err_hid ("Out of memory during hid input probe" ); +hid_err (hid,"Out of memory during hid input probe\n" ); goto out_unwind; }
drivers/hid/hid-kye.c +2 -2
@@ -32,8 +32,8 @@ static __u8 *kye_report_fixup(struct hid_device *hdev, __u8 *rdesc, rdesc[65] == 0x29 && rdesc[66] == 0x0f && rdesc[71] == 0x75 && rdesc[72] == 0x08 && rdesc[73] == 0x95 && rdesc[74] == 0x01) { -dev_info (&hdev->dev,"fixing up Kye/Genius Ergo Mouse report " -"descriptor\n" ); +hid_info (hdev, +"fixing up Kye/Genius Ergo Mouse report descriptor\n" ); rdesc[62 ] =0x09 ; rdesc[64 ] =0x04 ; rdesc[66 ] =0x07 ;
drivers/hid/hid-lg.c +7 -8
@@ -53,23 +53,22 @@ static __u8 *lg_report_fixup(struct hid_device *hdev, __u8 *rdesc,if ((quirks &LG_RDESC ) && *rsize >=90 && rdesc[83 ] ==0x26 && rdesc[84 ] ==0x8c && rdesc[85 ] ==0x02 ) { -dev_info (&hdev->dev,"fixing up Logitech keyboard report " -"descriptor\n" ); +hid_info (hdev, +"fixing up Logitech keyboard report descriptor\n" ); rdesc[84 ] = rdesc[89 ] =0x4d ; rdesc[85 ] = rdesc[90 ] =0x10 ; }if ((quirks &LG_RDESC_REL_ABS ) && *rsize >=50 && rdesc[32 ] ==0x81 && rdesc[33 ] ==0x06 && rdesc[49 ] ==0x81 && rdesc[50 ] ==0x06 ) { -dev_info (&hdev->dev,"fixing up rel/abs in Logitech " -"report descriptor\n" ); +hid_info (hdev, +"fixing up rel/abs in Logitech report descriptor\n" ); rdesc[33 ] = rdesc[50 ] =0x02 ; }if ((quirks &LG_FF4 ) && *rsize >=101 && rdesc[41 ] ==0x95 && rdesc[42 ] ==0x0B && rdesc[47 ] ==0x05 && rdesc[48 ] ==0x09 ) { -dev_info (&hdev->dev,"fixing up Logitech Speed Force Wireless " -"button descriptor\n" ); +hid_info (hdev,"fixing up Logitech Speed Force Wireless button descriptor\n" ); rdesc[41 ] =0x05 ; rdesc[42 ] =0x09 ; rdesc[47 ] =0x95 ;
@@ -288,7 +287,7 @@ static int lg_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err_free; }
@@ -297,7 +296,7 @@ static int lg_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_hw_start (hdev, connect_mask);if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err_free; }
drivers/hid/hid-lg2ff.c +4 -5
@@ -72,18 +72,18 @@ int lg2ff_init(struct hid_device *hid)int error;if (list_empty (report_list)) { -dev_err (&hid->dev,"no output report found\n" ); +hid_err (hid,"no output report found\n" );return -ENODEV ; } report = list_entry(report_list->next, struct hid_report, list);if (report->maxfield <1 ) { -dev_err (&hid->dev,"output report is empty\n" ); +hid_err (hid,"output report is empty\n" );return -ENODEV ; }if (report->field[0 ]->report_count <7 ) { -dev_err (&hid->dev,"not enough values in the field\n" ); +hid_err (hid,"not enough values in the field\n" );return -ENODEV ; }
@@ -110,8 +110,7 @@ int lg2ff_init(struct hid_device *hid)usbhid_submit_report (hid, report,USB_DIR_OUT ); -dev_info (&hid->dev,"Force feedback for Logitech RumblePad/Rumblepad 2 by " -"Anssi Hannula <[email protected]>\n" ); +hid_info (hid,"Force feedback for Logitech RumblePad/Rumblepad 2 by Anssi Hannula <[email protected]>\n" );return 0 ; }
drivers/hid/hid-lg3ff.c +4 -5
@@ -141,20 +141,20 @@ int lg3ff_init(struct hid_device *hid)/* Find the report to use */ if (list_empty (report_list)) { -err_hid ("No output report found" ); +hid_err (hid,"No output report found\n" );return -1 ; }/* Check that the report looks ok */ report = list_entry(report_list->next, struct hid_report, list);if (!report) { -err_hid ("NULL output report" ); +hid_err (hid,"NULL output report\n" );return -1 ; } field = report->field[0 ];if (!field) { -err_hid ("NULL field" ); +hid_err (hid,"NULL field\n" );return -1 ; }
@@ -169,8 +169,7 @@ int lg3ff_init(struct hid_device *hid)if (test_bit (FF_AUTOCENTER , dev->ffbit)) dev->ff->set_autocenter = hid_lg3ff_set_autocenter; -dev_info (&hid->dev,"Force feedback for Logitech Flight System G940 by " -"Gary Stein <[email protected]>\n" ); +hid_info (hid,"Force feedback for Logitech Flight System G940 by Gary Stein <[email protected]>\n" );return 0 ; }
drivers/hid/hid-lg4ff.c +4 -5
@@ -101,20 +101,20 @@ int lg4ff_init(struct hid_device *hid)/* Find the report to use */ if (list_empty (report_list)) { -err_hid ("No output report found" ); +hid_err (hid,"No output report found\n" );return -1 ; }/* Check that the report looks ok */ report = list_entry(report_list->next, struct hid_report, list);if (!report) { -err_hid ("NULL output report" ); +hid_err (hid,"NULL output report\n" );return -1 ; } field = report->field[0 ];if (!field) { -err_hid ("NULL field" ); +hid_err (hid,"NULL field\n" );return -1 ; }
@@ -129,8 +129,7 @@ int lg4ff_init(struct hid_device *hid)if (test_bit (FF_AUTOCENTER , dev->ffbit)) dev->ff->set_autocenter = hid_lg4ff_set_autocenter; -dev_info (&hid->dev,"Force feedback for Logitech Speed Force Wireless by " -"Simon Wood <[email protected]>\n" ); +hid_info (hid,"Force feedback for Logitech Speed Force Wireless by Simon Wood <[email protected]>\n" );return 0 ; }
drivers/hid/hid-lgff.c +5 -3
@@ -27,6 +27,8 @@* e-mail - mail your message to <[email protected]> */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/input.h> #include <linux/usb.h> #include <linux/hid.h>
@@ -146,7 +148,7 @@ int lgff_init(struct hid_device* hid)/* Find the report to use */ if (list_empty (report_list)) { -err_hid ("No output report found" ); +hid_err (hid,"No output report found\n" );return -1 ; }
@@ -154,7 +156,7 @@ int lgff_init(struct hid_device* hid) report = list_entry(report_list->next, struct hid_report, list); field = report->field[0 ];if (!field) { -err_hid ("NULL field" ); +hid_err (hid,"NULL field\n" );return -1 ; }
@@ -176,7 +178,7 @@ int lgff_init(struct hid_device* hid)if (test_bit (FF_AUTOCENTER , dev->ffbit) ) dev->ff->set_autocenter = hid_lgff_set_autocenter; -printk (KERN_INFO "Force feedback for Logitech force feedback devices by Johann Deneux <[email protected]>\n" ); +pr_info ("Force feedback for Logitech force feedback devices by Johann Deneux <[email protected]>\n" );return 0 ; }
drivers/hid/hid-magicmouse.c +8 -7
@@ -12,6 +12,8 @@* any later version. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#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 ) { -dev_err (&hdev->dev,"can't alloc magicmouse descriptor\n" ); +hid_err (hdev,"can't alloc magicmouse descriptor\n" );return -ENOMEM ; }
@@ -459,13 +461,13 @@ static int magicmouse_probe(struct hid_device *hdev, ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"magicmouse hid parse failed\n" ); +hid_err (hdev,"magicmouse hid parse failed\n" ); goto err_free; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT );if (ret) { -dev_err (&hdev->dev,"magicmouse hw start failed\n" ); +hid_err (hdev,"magicmouse hw start failed\n" ); goto err_free; }
@@ -486,7 +488,7 @@ static int magicmouse_probe(struct hid_device *hdev, }if (!report) { -dev_err (&hdev->dev,"unable to register touch report\n" ); +hid_err (hdev,"unable to register touch report\n" ); 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)) { -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; }
@@ -540,7 +541,7 @@ static int __init magicmouse_init(void) ret =hid_register_driver (&magicmouse_driver);if (ret) -printk (KERN_ERR "can't register magicmouse driver\n" ); +pr_err ("can't register magicmouse driver\n" );return ret; }
drivers/hid/hid-microsoft.c +3 -4
@@ -40,8 +40,7 @@ static __u8 *ms_report_fixup(struct hid_device *hdev, __u8 *rdesc,if ((quirks &MS_RDESC ) && *rsize ==571 && rdesc[557 ] ==0x19 && rdesc[559 ] ==0x29 ) { -dev_info (&hdev->dev,"fixing up Microsoft Wireless Receiver " -"Model 1028 report descriptor\n" ); +hid_info (hdev,"fixing up Microsoft Wireless Receiver Model 1028 report descriptor\n" ); rdesc[557 ] =0x35 ; rdesc[559 ] =0x45 ; }
@@ -155,14 +154,14 @@ static int ms_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err_free; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT | ((quirks &MS_HIDINPUT ) ?HID_CONNECT_HIDINPUT_FORCE :0 ));if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err_free; }
drivers/hid/hid-monterey.c +1 -2
@@ -26,8 +26,7 @@ static __u8 *mr_report_fixup(struct hid_device *hdev, __u8 *rdesc, unsigned int *rsize) {if (*rsize >=30 && rdesc[29 ] ==0x05 && rdesc[30 ] ==0x09 ) { -dev_info (&hdev->dev,"fixing up button/consumer in HID report " -"descriptor\n" ); +hid_info (hdev,"fixing up button/consumer in HID report descriptor\n" ); rdesc[30 ] =0x0c ; }return rdesc;
drivers/hid/hid-mosart.c +1 -1
@@ -199,7 +199,7 @@ static int mosart_probe(struct hid_device *hdev, const struct hid_device_id *id) td =kmalloc (sizeof (struct mosart_data ),GFP_KERNEL );if (!td) { -dev_err (&hdev->dev,"cannot allocate MosArt data\n" ); +hid_err (hdev,"cannot allocate MosArt data\n" );return -ENOMEM ; } td->valid = false;
drivers/hid/hid-ntrig.c +4 -5
@@ -130,8 +130,7 @@ static void ntrig_report_version(struct hid_device *hdev)if (ret ==8 ) { ret =ntrig_version_string (&data[2 ], buf); -dev_info (&hdev->dev, -"Firmware version: %s (%02x%02x %02x%02x)\n" , +hid_info (hdev,"Firmware version: %s (%02x%02x %02x%02x)\n" , buf, data[2 ], data[3 ], data[4 ], data[5 ]); }
@@ -831,7 +830,7 @@ static int ntrig_probe(struct hid_device *hdev, const struct hid_device_id *id) nd =kmalloc (sizeof (struct ntrig_data ),GFP_KERNEL );if (!nd) { -dev_err (&hdev->dev,"cannot allocate N-Trig data\n" ); +hid_err (hdev,"cannot allocate N-Trig data\n" );return -ENOMEM ; }
@@ -850,13 +849,13 @@ static int ntrig_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err_free; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT & ~HID_CONNECT_FF );if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err_free; }
drivers/hid/hid-ortek.c +1 -2
@@ -23,8 +23,7 @@ static __u8 *ortek_report_fixup(struct hid_device *hdev, __u8 *rdesc, unsigned int *rsize) {if (*rsize >=56 && rdesc[54 ] ==0x25 && rdesc[55 ] ==0x01 ) { -dev_info (&hdev->dev,"Fixing up Ortek WKB-2000 " -"report descriptor.\n" ); +hid_info (hdev,"Fixing up Ortek WKB-2000 report descriptor\n" ); rdesc[55 ] =0x92 ; }return rdesc;
drivers/hid/hid-petalynx.c +3 -4
@@ -29,8 +29,7 @@ static __u8 *pl_report_fixup(struct hid_device *hdev, __u8 *rdesc,if (*rsize >=60 && rdesc[39 ] ==0x2a && rdesc[40 ] ==0xf5 && rdesc[41 ] ==0x00 && rdesc[59 ] ==0x26 && rdesc[60 ] ==0xf9 && rdesc[61 ] ==0x00 ) { -dev_info (&hdev->dev,"fixing up Petalynx Maxter Remote report " -"descriptor\n" ); +hid_info (hdev,"fixing up Petalynx Maxter Remote report descriptor\n" ); rdesc[60 ] =0xfa ; rdesc[40 ] =0xfa ; }
@@ -77,13 +76,13 @@ static int pl_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err_free; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT );if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err_free; }
drivers/hid/hid-picolcd.c +21 -24
134 lines not on this page · raw message
drivers/hid/hid-pl.c +7 -9
@@ -103,7 +103,7 @@ static int plff_init(struct hid_device *hid)*/ if (list_empty (report_list)) { -dev_err (&hid->dev,"no output reports found\n" ); +hid_err (hid,"no output reports found\n" );return -ENODEV ; }
@@ -112,14 +112,13 @@ static int plff_init(struct hid_device *hid) report_ptr = report_ptr->next;if (report_ptr == report_list) { -dev_err (&hid->dev,"required output report is " -"missing\n" ); +hid_err (hid,"required output report is missing\n" );return -ENODEV ; } report = list_entry(report_ptr, struct hid_report, list);if (report->maxfield <1 ) { -dev_err (&hid->dev,"no fields in the report\n" ); +hid_err (hid,"no fields in the report\n" );return -ENODEV ; }
@@ -137,7 +136,7 @@ static int plff_init(struct hid_device *hid) weak = &report->field[3 ]->value[0 ];debug ("detected 4-field device" ); }else { -dev_err (&hid->dev,"not enough fields or values\n" ); +hid_err (hid,"not enough fields or values\n" );return -ENODEV ; }
@@ -164,8 +163,7 @@ static int plff_init(struct hid_device *hid)usbhid_submit_report (hid, plff->report,USB_DIR_OUT ); } -dev_info (&hid->dev,"Force feedback for PantherLord/GreenAsia " -"devices by Anssi Hannula <[email protected]>\n" ); +hid_info (hid,"Force feedback for PantherLord/GreenAsia devices by Anssi Hannula <[email protected]>\n" );return 0 ; }
@@ -185,13 +183,13 @@ static int pl_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT & ~HID_CONNECT_FF );if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err; }
drivers/hid/hid-prodikeys.c +11 -10
@@ -16,6 +16,8 @@* any later version. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/device.h> #include <linux/module.h> #include <linux/usb.h>
@@ -285,11 +287,11 @@ static int pcmidi_get_output_report(struct pcmidi_snd *pm)continue ;if (report->maxfield <1 ) { -dev_err (&hdev->dev,"output report is empty\n" ); +hid_err (hdev,"output report is empty\n" );break ; }if (report->field[0 ]->report_count !=2 ) { -dev_err (&hdev->dev,"field count too low\n" ); +hid_err (hdev,"field count too low\n" );break ; } pm->pcmidi_report6 = report;
@@ -746,8 +748,8 @@ static __u8 *pk_report_fixup(struct hid_device *hdev, __u8 *rdesc,if (*rsize ==178 && rdesc[111 ] ==0x06 && rdesc[112 ] ==0x00 && rdesc[113 ] ==0xff ) { -dev_info (&hdev->dev,"fixing up pc-midi keyboard report " -"descriptor\n" ); +hid_info (hdev, +"fixing up pc-midi keyboard report descriptor\n" ); rdesc[144 ] =0x18 ;/* report 4: was 0x10 report count */ }
@@ -805,7 +807,7 @@ static int pk_probe(struct hid_device *hdev, const struct hid_device_id *id) pk =kzalloc (sizeof (*pk),GFP_KERNEL );if (pk ==NULL ) { -dev_err (&hdev->dev,"prodikeys: can't alloc descriptor\n" ); +hid_err (hdev,"can't alloc descriptor\n" );return -ENOMEM ; }
@@ -813,8 +815,7 @@ static int pk_probe(struct hid_device *hdev, const struct hid_device_id *id) pm =kzalloc (sizeof (*pm),GFP_KERNEL );if (pm ==NULL ) { -dev_err (&hdev->dev, -"prodikeys: can't alloc descriptor\n" ); +hid_err (hdev,"can't alloc descriptor\n" ); ret = -ENOMEM ; goto err_free; }
@@ -827,7 +828,7 @@ static int pk_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"prodikeys: hid parse failed\n" ); +hid_err (hdev,"hid parse failed\n" ); goto err_free; }
@@ -837,7 +838,7 @@ static int pk_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT );if (ret) { -dev_err (&hdev->dev,"prodikeys: hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err_free; }
@@ -896,7 +897,7 @@ static int pk_init(void) ret =hid_register_driver (&pk_driver);if (ret) -printk (KERN_ERR "can't register prodikeys driver\n" ); +pr_err ("can't register prodikeys driver\n" );return ret; }
drivers/hid/hid-quanta.c +1 -1
@@ -195,7 +195,7 @@ static int quanta_probe(struct hid_device *hdev, const struct hid_device_id *id) td =kmalloc (sizeof (struct quanta_data ),GFP_KERNEL );if (!td) { -dev_err (&hdev->dev,"cannot allocate Quanta Touch data\n" ); +hid_err (hdev,"cannot allocate Quanta Touch data\n" );return -ENOMEM ; } td->valid = false;
drivers/hid/hid-roccat-kone.c +10 -12
@@ -90,8 +90,7 @@ static int kone_check_write(struct usb_device *usb_dev)kfree (data);return 0 ; }else {/* unknown answer */ -dev_err (&usb_dev->dev,"got retval %d when checking write\n" , - *data); +hid_err (usb_dev,"got retval %d when checking write\n" , *data);kfree (data);return -EIO ; }
@@ -556,7 +555,7 @@ static ssize_t kone_sysfs_set_tcu(struct device *dev, retval =kone_set_settings (usb_dev, &kone->settings);if (retval) { -dev_err (&usb_dev->dev,"couldn't set tcu state\n" ); +hid_err (usb_dev,"couldn't set tcu state\n" );/* * try to reread valid settings into buffer overwriting * first error code
@@ -570,7 +569,7 @@ static ssize_t kone_sysfs_set_tcu(struct device *dev, retval = size; exit_no_settings: -dev_err (&usb_dev->dev,"couldn't read settings\n" ); +hid_err (usb_dev,"couldn't read settings\n" ); exit_unlock:mutex_unlock (&kone->kone_lock);return retval;
@@ -818,21 +817,20 @@ static int kone_init_specials(struct hid_device *hdev) kone =kzalloc (sizeof (*kone),GFP_KERNEL );if (!kone) { -dev_err (&hdev->dev,"can't alloc device descriptor\n" ); +hid_err (hdev,"can't alloc device descriptor\n" );return -ENOMEM ; }hid_set_drvdata (hdev, kone); retval =kone_init_kone_device_struct (usb_dev, kone);if (retval) { -dev_err (&hdev->dev, -"couldn't init struct kone_device\n" ); +hid_err (hdev,"couldn't init struct kone_device\n" ); goto exit_free; } retval =roccat_connect (hdev);if (retval <0 ) { -dev_err (&hdev->dev,"couldn't init char dev\n" ); +hid_err (hdev,"couldn't init char dev\n" );/* be tolerant about not getting chrdev */ }else { kone->roccat_claimed =1 ;
@@ -841,7 +839,7 @@ static int kone_init_specials(struct hid_device *hdev) retval =kone_create_sysfs_attributes (intf);if (retval) { -dev_err (&hdev->dev,"cannot create sysfs files\n" ); +hid_err (hdev,"cannot create sysfs files\n" ); goto exit_free; } }else {
@@ -876,19 +874,19 @@ static int kone_probe(struct hid_device *hdev, const struct hid_device_id *id) retval =hid_parse (hdev);if (retval) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto exit; } retval =hid_hw_start (hdev,HID_CONNECT_DEFAULT );if (retval) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto exit; } retval =kone_init_specials (hdev);if (retval) { -dev_err (&hdev->dev,"couldn't install mouse\n" ); +hid_err (hdev,"couldn't install mouse\n" ); goto exit_stop; }
drivers/hid/hid-roccat-pyra.c +9 -11
@@ -87,9 +87,8 @@ static int pyra_receive_control_status(struct usb_device *usb_dev) control.value == 1) return 0; else { -dev_err (&usb_dev->dev,"receive control status: " -"unknown response 0x%x 0x%x\n" , - control.request, control.value); +hid_err (usb_dev,"receive control status: unknown response 0x%x 0x%x\n" , + control.request, control.value);return -EINVAL ; } }
@@ -770,21 +769,20 @@ static int pyra_init_specials(struct hid_device *hdev) pyra =kzalloc (sizeof (*pyra),GFP_KERNEL );if (!pyra) { -dev_err (&hdev->dev,"can't alloc device descriptor\n" ); +hid_err (hdev,"can't alloc device descriptor\n" );return -ENOMEM ; }hid_set_drvdata (hdev, pyra); retval =pyra_init_pyra_device_struct (usb_dev, pyra);if (retval) { -dev_err (&hdev->dev, -"couldn't init struct pyra_device\n" ); +hid_err (hdev,"couldn't init struct pyra_device\n" ); goto exit_free; } retval =roccat_connect (hdev);if (retval <0 ) { -dev_err (&hdev->dev,"couldn't init char dev\n" ); +hid_err (hdev,"couldn't init char dev\n" ); }else { pyra->chrdev_minor = retval; pyra->roccat_claimed =1 ;
@@ -792,7 +790,7 @@ static int pyra_init_specials(struct hid_device *hdev) retval =pyra_create_sysfs_attributes (intf);if (retval) { -dev_err (&hdev->dev,"cannot create sysfs files\n" ); +hid_err (hdev,"cannot create sysfs files\n" ); goto exit_free; } }else {
@@ -826,19 +824,19 @@ static int pyra_probe(struct hid_device *hdev, const struct hid_device_id *id) retval =hid_parse (hdev);if (retval) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto exit; } retval =hid_hw_start (hdev,HID_CONNECT_DEFAULT );if (retval) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto exit; } retval =pyra_init_specials (hdev);if (retval) { -dev_err (&hdev->dev,"couldn't install mouse\n" ); +hid_err (hdev,"couldn't install mouse\n" ); goto exit_stop; }return 0 ;
drivers/hid/hid-roccat.c +5 -5
@@ -21,6 +21,8 @@* It is inspired by hidraw, but uses only one circular buffer for all readers. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/cdev.h> #include <linux/poll.h> #include <linux/sched.h>
@@ -165,8 +167,7 @@ static int roccat_open(struct inode *inode, struct file *file)mutex_lock (&device->readers_lock);if (!device) { -printk (KERN_EMERG "roccat device with minor %d doesn't exist\n" , - minor); +pr_emerg ("roccat device with minor %d doesn't exist\n" , minor); error = -ENODEV ; goto exit_err; }
@@ -214,8 +215,7 @@ static int roccat_release(struct inode *inode, struct file *file) device = devices[minor];if (!device) {mutex_unlock (&devices_lock); -printk (KERN_EMERG "roccat device with minor %d doesn't exist\n" , - minor); +pr_emerg ("roccat device with minor %d doesn't exist\n" , minor);return -ENODEV ; }
@@ -392,7 +392,7 @@ static int __init roccat_init(void) roccat_major =MAJOR (dev_id);if (retval <0 ) { -printk (KERN_WARNING "roccat: can't get major number\n" ); +pr_warn ("can't get major number\n" );return retval; }
drivers/hid/hid-samsung.c +4 -4
@@ -57,8 +57,8 @@static inline void samsung_irda_dev_trace (struct hid_device *hdev,unsigned int rsize) { -dev_info (&hdev->dev,"fixing up Samsung IrDA %d byte report " -"descriptor\n" , rsize); +hid_info (hdev,"fixing up Samsung IrDA %d byte report descriptor\n" , + rsize); } static __u8 *samsung_irda_report_fixup(struct hid_device *hdev, __u8 *rdesc,
@@ -160,7 +160,7 @@ static int samsung_probe(struct hid_device *hdev, ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err_free; }
@@ -174,7 +174,7 @@ static int samsung_probe(struct hid_device *hdev, ret =hid_hw_start (hdev, cmask);if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err_free; }
drivers/hid/hid-sjoy.c +7 -9
@@ -74,26 +74,25 @@ static int sjoyff_init(struct hid_device *hid)int error;if (list_empty (report_list)) { -dev_err (&hid->dev,"no output reports found\n" ); +hid_err (hid,"no output reports found\n" );return -ENODEV ; } report_ptr = report_ptr->next;if (report_ptr == report_list) { -dev_err (&hid->dev,"required output report is " -"missing\n" ); +hid_err (hid,"required output report is missing\n" );return -ENODEV ; } report = list_entry(report_ptr, struct hid_report, list);if (report->maxfield <1 ) { -dev_err (&hid->dev,"no fields in the report\n" ); +hid_err (hid,"no fields in the report\n" );return -ENODEV ; }if (report->field[0 ]->report_count <3 ) { -dev_err (&hid->dev,"not enough values in the field\n" ); +hid_err (hid,"not enough values in the field\n" );return -ENODEV ; }
@@ -117,8 +116,7 @@ static int sjoyff_init(struct hid_device *hid) sjoyff->report->field[0 ]->value[2 ] =0x00 ;usbhid_submit_report (hid, sjoyff->report,USB_DIR_OUT ); -dev_info (&hid->dev, -"Force feedback for SmartJoy PLUS PS2/USB adapter\n" ); +hid_info (hid,"Force feedback for SmartJoy PLUS PS2/USB adapter\n" );return 0 ; }
@@ -135,13 +133,13 @@ static int sjoy_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT & ~HID_CONNECT_FF );if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err; }
drivers/hid/hid-sony.c +5 -6
@@ -40,8 +40,7 @@ static __u8 *sony_report_fixup(struct hid_device *hdev, __u8 *rdesc,if ((sc->quirks &VAIO_RDESC_CONSTANT ) && *rsize >=56 && rdesc[54 ] ==0x81 && rdesc[55 ] ==0x07 ) { -dev_info (&hdev->dev,"Fixing up Sony Vaio VGX report " -"descriptor\n" ); +hid_info (hdev,"Fixing up Sony Vaio VGX report descriptor\n" ); rdesc[55 ] =0x06 ; }return rdesc;
@@ -89,7 +88,7 @@ static int sixaxis_set_operational_usb(struct hid_device *hdev) (3 <<8 ) |0xf2 , ifnum, buf,17 , USB_CTRL_GET_TIMEOUT);if (ret <0 ) -dev_err (&hdev->dev,"can't set operational mode\n" ); +hid_err (hdev,"can't set operational mode\n" );kfree (buf);
@@ -110,7 +109,7 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id) sc =kzalloc (sizeof (*sc),GFP_KERNEL );if (sc ==NULL ) { -dev_err (&hdev->dev,"can't alloc sony descriptor\n" ); +hid_err (hdev,"can't alloc sony descriptor\n" );return -ENOMEM ; }
@@ -119,14 +118,14 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err_free; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT |HID_CONNECT_HIDDEV_FORCE );if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err_free; }
drivers/hid/hid-stantum.c +1 -1
@@ -222,7 +222,7 @@ static int stantum_probe(struct hid_device *hdev, sd =kmalloc (sizeof (struct stantum_data ),GFP_KERNEL );if (!sd) { -dev_err (&hdev->dev,"cannot allocate Stantum data\n" ); +hid_err (hdev,"cannot allocate Stantum data\n" );return -ENOMEM ; } sd->valid = false;
drivers/hid/hid-sunplus.c +1 -2
@@ -27,8 +27,7 @@ static __u8 *sp_report_fixup(struct hid_device *hdev, __u8 *rdesc, {if (*rsize >=107 && rdesc[104 ] ==0x26 && rdesc[105 ] ==0x80 && rdesc[106 ] ==0x03 ) { -dev_info (&hdev->dev,"fixing up Sunplus Wireless Desktop " -"report descriptor\n" ); +hid_info (hdev,"fixing up Sunplus Wireless Desktop report descriptor\n" ); rdesc[105 ] = rdesc[110 ] =0x03 ; rdesc[106 ] = rdesc[111 ] =0x21 ; }
drivers/hid/hid-tmff.c +10 -17
@@ -151,28 +151,23 @@ static int tmff_init(struct hid_device *hid, const signed short *ff_bits)switch (field->usage[0 ].hid) {case THRUSTMASTER_USAGE_FF :if (field->report_count <2 ) { -dev_warn (&hid->dev,"ignoring FF field " -"with report_count < 2\n" ); +hid_warn (hid,"ignoring FF field with report_count < 2\n" );continue ; }if (field->logical_maximum == field->logical_minimum) { -dev_warn (&hid->dev,"ignoring FF field " -"with logical_maximum " -"== logical_minimum\n" ); +hid_warn (hid,"ignoring FF field with logical_maximum == logical_minimum\n" );continue ; }if (tmff->report && tmff->report != report) { -dev_warn (&hid->dev,"ignoring FF field " -"in other report\n" ); +hid_warn (hid,"ignoring FF field in other report\n" );continue ; }if (tmff->ff_field && tmff->ff_field != field) { -dev_warn (&hid->dev,"ignoring " -"duplicate FF field\n" ); +hid_warn (hid,"ignoring duplicate FF field\n" );continue ; }
@@ -185,16 +180,15 @@ static int tmff_init(struct hid_device *hid, const signed short *ff_bits)break ;default : -dev_warn (&hid->dev,"ignoring unknown output " -"usage %08x\n" , - field->usage[0 ].hid); +hid_warn (hid,"ignoring unknown output usage %08x\n" , + field->usage[0 ].hid);continue ; } } }if (!tmff->report) { -dev_err (&hid->dev,"can't find FF field in output reports\n" ); +hid_err (hid,"can't find FF field in output reports\n" ); error = -ENODEV ; goto fail; }
@@ -203,8 +197,7 @@ static int tmff_init(struct hid_device *hid, const signed short *ff_bits)if (error) goto fail; -dev_info (&hid->dev,"force feedback for ThrustMaster devices by Zinx " -"Verituse <[email protected]>" ); +hid_info (hid,"force feedback for ThrustMaster devices by Zinx Verituse <[email protected]>\n" );return 0 ; fail:
@@ -224,13 +217,13 @@ static int tm_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT & ~HID_CONNECT_FF );if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err; }
drivers/hid/hid-wacom.c +14 -12
@@ -18,6 +18,8 @@* any later version. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/device.h> #include <linux/hid.h> #include <linux/module.h>
@@ -141,8 +143,8 @@ static void wacom_poke(struct hid_device *hdev, u8 speed)* Note that if the raw queries fail, it's not a hard failure and it * is safe to continue */ -dev_warn (&hdev->dev,"failed to poke device, command %d, err %d\n" , - rep_data[0 ], ret); +hid_warn (hdev,"failed to poke device, command %d, err %d\n" , + rep_data[0 ], ret);return ; }
@@ -312,7 +314,7 @@ static int wacom_probe(struct hid_device *hdev, wdata =kzalloc (sizeof (*wdata),GFP_KERNEL );if (wdata ==NULL ) { -dev_err (&hdev->dev,"can't alloc wacom descriptor\n" ); +hid_err (hdev,"can't alloc wacom descriptor\n" );return -ENOMEM ; }
@@ -321,20 +323,20 @@ static int wacom_probe(struct hid_device *hdev,/* Parse the HID report now */ ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err_free; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT );if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err_free; } ret =device_create_file (&hdev->dev, &dev_attr_speed);if (ret) -dev_warn (&hdev->dev, -"can't create sysfs speed attribute err: %d\n" , ret); +hid_warn (hdev, +"can't create sysfs speed attribute err: %d\n" , ret);/* Set Wacom mode 2 with high reporting speed */ wacom_poke (hdev,1 );
@@ -349,8 +351,8 @@ static int wacom_probe(struct hid_device *hdev, ret =power_supply_register (&hdev->dev, &wdata->battery);if (ret) { -dev_warn (&hdev->dev, -"can't create sysfs battery attribute, err: %d\n" , ret); +hid_warn (hdev,"can't create sysfs battery attribute, err: %d\n" , + ret);/* * battery attribute is not critical for the tablet, but if it * failed then there is no need to create ac attribute
@@ -367,8 +369,8 @@ static int wacom_probe(struct hid_device *hdev, ret =power_supply_register (&hdev->dev, &wdata->ac);if (ret) { -dev_warn (&hdev->dev, -"can't create ac battery attribute, err: %d\n" , ret); +hid_warn (hdev, +"can't create ac battery attribute, err: %d\n" , ret);/* * ac attribute is not critical for the tablet, but if it * failed then we don't want to battery attribute to exist
@@ -454,7 +456,7 @@ static int __init wacom_init(void) ret =hid_register_driver (&wacom_driver);if (ret) -printk (KERN_ERR "can't register wacom driver\n" ); +pr_err ("can't register wacom driver\n" );return ret; }
drivers/hid/hid-zpff.c +5 -6
@@ -75,14 +75,14 @@ static int zpff_init(struct hid_device *hid)int error;if (list_empty (report_list)) { -dev_err (&hid->dev,"no output report found\n" ); +hid_err (hid,"no output report found\n" );return -ENODEV ; } report = list_entry(report_list->next, struct hid_report, list);if (report->maxfield <4 ) { -dev_err (&hid->dev,"not enough fields in report\n" ); +hid_err (hid,"not enough fields in report\n" );return -ENODEV ; }
@@ -105,8 +105,7 @@ static int zpff_init(struct hid_device *hid) zpff->report->field[3 ]->value[0 ] =0x00 ;usbhid_submit_report (hid, zpff->report,USB_DIR_OUT ); -dev_info (&hid->dev,"force feedback for Zeroplus based devices by " -"Anssi Hannula <[email protected]>\n" ); +hid_info (hid,"force feedback for Zeroplus based devices by Anssi Hannula <[email protected]>\n" );return 0 ; }
@@ -123,13 +122,13 @@ static int zp_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT & ~HID_CONNECT_FF );if (ret) { -dev_err (&hdev->dev,"hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err; }
drivers/hid/hid-zydacron.c +5 -6
@@ -34,9 +34,8 @@ static __u8 *zc_report_fixup(struct hid_device *hdev, __u8 *rdesc, rdesc[0x96] == 0xbc && rdesc[0x97] == 0xff && rdesc[0xca] == 0xbc && rdesc[0xcb] == 0xff && rdesc[0xe1] == 0xbc && rdesc[0xe2] == 0xff) { -dev_info (&hdev->dev, -"fixing up zydacron remote control report " -"descriptor\n" ); +hid_info (hdev, +"fixing up zydacron remote control report descriptor\n" ); rdesc[0x96 ] = rdesc[0xca ] = rdesc[0xe1 ] =0x0c ; rdesc[0x97 ] = rdesc[0xcb ] = rdesc[0xe2 ] =0x00 ; }
@@ -172,7 +171,7 @@ static int zc_probe(struct hid_device *hdev, const struct hid_device_id *id) zc =kzalloc (sizeof (*zc),GFP_KERNEL );if (zc ==NULL ) { -dev_err (&hdev->dev,"zydacron: can't alloc descriptor\n" ); +hid_err (hdev,"can't alloc descriptor\n" );return -ENOMEM ; }
@@ -180,13 +179,13 @@ static int zc_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =hid_parse (hdev);if (ret) { -dev_err (&hdev->dev,"zydacron: parse failed\n" ); +hid_err (hdev,"parse failed\n" ); goto err_free; } ret =hid_hw_start (hdev,HID_CONNECT_DEFAULT );if (ret) { -dev_err (&hdev->dev,"zydacron: hw start failed\n" ); +hid_err (hdev,"hw start failed\n" ); goto err_free; }
drivers/hid/hidraw.c +7 -5
@@ -19,6 +19,8 @@* 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/fs.h> #include <linux/module.h> #include <linux/errno.h>
@@ -122,15 +124,15 @@ static ssize_t hidraw_write(struct file *file, const char __user *buffer, size_t }if (count >HID_MAX_BUFFER_SIZE ) { -printk (KERN_WARNING "hidraw: pid %d passed too large report\n" , -task_pid_nr (current)); +hid_warn (dev,"pid %d passed too large report\n" , +task_pid_nr (current)); ret = -EINVAL ; goto out; }if (count <2 ) { -printk (KERN_WARNING "hidraw: pid %d passed too short report\n" , -task_pid_nr (current)); +hid_warn (dev,"pid %d passed too short report\n" , +task_pid_nr (current)); ret = -EINVAL ; goto out; }
@@ -449,7 +451,7 @@ int __init hidraw_init(void) hidraw_major =MAJOR (dev_id);if (result <0 ) { -printk (KERN_WARNING "hidraw: can't get major number\n" ); +pr_warn ("can't get major number\n" ); result =0 ; goto out; }
drivers/hid/usbhid/hid-core.c +23 -25
137 lines not on this page · raw message
drivers/hid/usbhid/hid-pidff.c +77 -87
443 lines not on this page · raw message
drivers/hid/usbhid/hiddev.c +1 -1
@@ -905,7 +905,7 @@ int hiddev_connect(struct hid_device *hid, unsigned int force) hiddev->exist =1 ; retval =usb_register_dev (usbhid->intf, &hiddev_class);if (retval) { -err_hid ("Not able to get a minor for this device." ); +hid_err (hid,"Not able to get a minor for this device\n" ); hid->hiddev =NULL ;kfree (hiddev);return -1 ;
drivers/hid/usbhid/usbkbd.c +14 -10
@@ -24,6 +24,8 @@* Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/kernel.h> #include <linux/slab.h> #include <linux/module.h>
@@ -104,16 +106,18 @@ static void usb_kbd_irq(struct urb *urb)if (usb_kbd_keycode[kbd->old[i]])input_report_key (kbd->dev, usb_kbd_keycode[kbd->old[i]],0 );else -dev_info (&urb->dev->dev, -"Unknown key (scancode %#x) released.\n" , kbd->old[i]); +hid_info (urb->dev, +"Unknown key (scancode %#x) released.\n" , + kbd->old[i]); }if (kbd->new[i] >3 &&memscan (kbd->old +2 , kbd->new[i],6 ) == kbd->old +8 ) {if (usb_kbd_keycode[kbd->new[i]])input_report_key (kbd->dev, usb_kbd_keycode[kbd->new[i]],1 );else -dev_info (&urb->dev->dev, -"Unknown key (scancode %#x) released.\n" , kbd->new[i]); +hid_info (urb->dev, +"Unknown key (scancode %#x) released.\n" , + kbd->new[i]); } }
@@ -124,9 +128,9 @@ static void usb_kbd_irq(struct urb *urb) resubmit: i =usb_submit_urb (urb,GFP_ATOMIC );if (i) -err_hid ("can't resubmit intr, %s-%s/input0, status %d" , - kbd->usbdev->bus->bus_name, - kbd->usbdev->devpath, i); +hid_err (urb->dev,"can't resubmit intr, %s-%s/input0, status %d" , + kbd->usbdev->bus->bus_name, + kbd->usbdev->devpath, i); } static int usb_kbd_event(struct input_dev *dev, unsigned int type,
@@ -150,7 +154,7 @@ static int usb_kbd_event(struct input_dev *dev, unsigned int type, *(kbd->leds) = kbd->newleds; kbd->led->dev = kbd->usbdev;if (usb_submit_urb (kbd->led,GFP_ATOMIC )) -err_hid ("usb_submit_urb(leds) failed" ); +pr_err ("usb_submit_urb(leds) failed\n" );return 0 ; }
@@ -160,7 +164,7 @@ static void usb_kbd_led(struct urb *urb)struct usb_kbd *kbd = urb->context;if (urb->status) -dev_warn (&urb->dev->dev,"led urb status %d received\n" , +hid_warn (urb->dev,"led urb status %d received\n" , urb->status);if (*(kbd->leds) == kbd->newleds)
@@ -169,7 +173,7 @@ static void usb_kbd_led(struct urb *urb) *(kbd->leds) = kbd->newleds; kbd->led->dev = kbd->usbdev;if (usb_submit_urb (kbd->led,GFP_ATOMIC )) -err_hid ("usb_submit_urb(leds) failed" ); +hid_err (urb->dev,"usb_submit_urb(leds) failed\n" ); }static int usb_kbd_open (struct input_dev *dev)
include/linux/hid.h +26 -6
@@ -881,12 +881,32 @@ int hid_pidff_init(struct hid_device *hid);#define hid_pidff_init NULL#endif -#define dbg_hid(format, arg...) if (hid_debug) \ - printk(KERN_DEBUG "%s: " format ,\ - __FILE__ , ## arg) -#define err_hid(format, arg...) printk(KERN_ERR "%s: " format "\n" , \ - __FILE__ , ## arg) -#endif /* HID_FF */ +#define dbg_hid(format, arg...) \ +do { \ + if (hid_debug) \ + printk(KERN_DEBUG "%s: " format, __FILE__, ##arg); \ +} while (0) + +#define hid_printk(level, hid, fmt, arg...) \ + dev_printk(level, &(hid)->dev, fmt, ##arg) +#define hid_emerg(hid, fmt, arg...) \ + dev_emerg(&(hid)->dev, fmt, ##arg) +#define hid_crit(hid, fmt, arg...) \ + dev_crit(&(hid)->dev, fmt, ##arg) +#define hid_alert(hid, fmt, arg...) \ + dev_alert(&(hid)->dev, fmt, ##arg) +#define hid_err(hid, fmt, arg...) \ + dev_err(&(hid)->dev, fmt, ##arg) +#define hid_notice(hid, fmt, arg...) \ + dev_notice(&(hid)->dev, fmt, ##arg) +#define hid_warn(hid, fmt, arg...) \ + dev_warn(&(hid)->dev, fmt, ##arg) +#define hid_info(hid, fmt, arg...) \ + dev_info(&(hid)->dev, fmt, ##arg) +#define hid_dbg(hid, fmt, arg...) \ + dev_dbg(&(hid)->dev, fmt, ##arg) + +#endif /* __KERNEL__ */ #endif
Signature · 1 line
1.7.3.3.464.gf80b6
PATCH 2/6 hid: Use vzalloc for vmalloc/memset(,0...)
In reply to Jiri Kosina--- drivers/hid/hid-core.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
drivers/hid/hid-core.c +1 -2
@@ -654,13 +654,12 @@ int hid_parse_report(struct hid_device *device, __u8 *start,return -ENOMEM ; device->rsize = size; - parser =vmalloc (sizeof (struct hid_parser )); + parser =vzalloc (sizeof (struct hid_parser ));if (!parser) { ret = -ENOMEM ; goto err; } -memset (parser,0 ,sizeof (struct hid_parser )); parser->device = device; end = start + size;
Signature · 1 line
1.7.3.3.464.gf80b6
PATCH 3/6 hid: Remove __inline__ from functions
In reply to Jiri KosinaLet the compiler decide instead.
--- drivers/hid/hid-core.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
drivers/hid/hid-core.c +5 -5
@@ -739,8 +739,8 @@ static u32 s32ton(__s32 value, unsigned n)* Search linux-kernel and linux-usb-devel archives for "hid-core extract". */ -static __inline____u32 extract (const struct hid_device *hid,__u8 *report, -unsigned offset,unsigned n) +static __u32 extract (const struct hid_device *hid,__u8 *report, +unsigned offset,unsigned n) {u64 x;
@@ -763,8 +763,8 @@ static __inline__ __u32 extract(const struct hid_device *hid, __u8 *report,* endianness of register values by considering a register * a "cached" copy of the little endiad bit stream. */ -static __inline__void implement (const struct hid_device *hid,__u8 *report, -unsigned offset,unsigned n,__u32 value) +static void implement (const struct hid_device *hid,__u8 *report, +unsigned offset,unsigned n,__u32 value) {u64 x;u64 m = (1ULL << n) -1 ;
@@ -792,7 +792,7 @@ static __inline__ void implement(const struct hid_device *hid, __u8 *report,* Search an array for a value. */ -static __inline__int search (__s32 *array,__s32 value,unsigned n) +static int search (__s32 *array,__s32 value,unsigned n) {while (n--) {if (*array++ == value)
Signature · 1 line
1.7.3.3.464.gf80b6
PATCH 4/6 hid: Remove unnecessary multiplies from loops
In reply to Jiri KosinaUse += instead of multiply.
Use correct indentation.
Move logical tests continuations to the more commonly used end of previous line.
--- drivers/hid/hid-core.c | 40 ++++++++++++++++++++++++---------------- 1 files changed, 24 insertions(+), 16 deletions(-)
drivers/hid/hid-core.c +24 -16
@@ -897,33 +897,41 @@ static void hid_input_field(struct hid_device *hid, struct hid_field *field,for (n =0 ; n < count; n++) { value[n] = min <0 ? -snto32 (extract (hid, data, offset + n * size, size), - size) : -extract (hid, data, offset + n * size, size); +snto32 (extract (hid, data, offset, size), size) : +extract (hid, data, offset, size);/* Ignore report if ErrorRollOver */ if (!(field->flags &HID_MAIN_ITEM_VARIABLE ) && value[n] >= min && value[n] <= max && field->usage[value[n] - min].hid ==HID_UP_KEYBOARD +1 ) goto exit; + + offset += size; }for (n =0 ; n < count; n++) {if (HID_MAIN_ITEM_VARIABLE & field->flags) { -hid_process_event (hid, field, &field->usage[n], value[n], interrupt); +hid_process_event (hid, field, &field->usage[n], + value[n], interrupt);continue ; } -if (field->value[n] >= min && field->value[n] <= max - && field->usage[field->value[n] - min].hid - &&search (value, field->value[n], count)) -hid_process_event (hid, field, &field->usage[field->value[n] - min],0 , interrupt); - -if (value[n] >= min && value[n] <= max - && field->usage[value[n] - min].hid - &&search (field->value, value[n], count)) -hid_process_event (hid, field, &field->usage[value[n] - min],1 , interrupt); +if (field->value[n] >= min && + field->value[n] <= max && + field->usage[field->value[n] - min].hid && +search (value, field->value[n], count)) +hid_process_event (hid, field, + &field->usage[field->value[n] - min], +0 , interrupt); + +if (value[n] >= min && + value[n] <= max && + field->usage[value[n] - min].hid && +search (field->value, value[n], count)) +hid_process_event (hid, field, + &field->usage[value[n] - min], +1 , interrupt); }memcpy (field->value, value, count *sizeof (__s32));
@@ -945,11 +953,11 @@ static void hid_output_field(const struct hid_device *hid,for (n =0 ; n < count; n++) {if (field->logical_minimum <0 )/* signed values */ -implement (hid, data, offset + n * size, size, +implement (hid, data, offset, size,s32ton (field->value[n], size));else /* unsigned values */ -implement (hid, data, offset + n * size, size, - field->value[n]); +implement (hid, data, offset, size, field->value[n]); + offset += size; } }
Signature · 1 line
1.7.3.3.464.gf80b6
PATCH 5/6 hid: Hoist assigns from ifs
In reply to Jiri Kosina--- drivers/hid/hid-core.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-)
drivers/hid/hid-core.c +13 -6
@@ -61,7 +61,8 @@ struct hid_report *hid_register_report(struct hid_device *device, unsigned type,if (report_enum->report_id_hash[id])return report_enum->report_id_hash[id]; -if (!(report =kzalloc (sizeof (struct hid_report ),GFP_KERNEL ))) + report =kzalloc (sizeof (struct hid_report ),GFP_KERNEL ); +if (!report)return NULL ;if (id !=0 )
@@ -92,8 +93,11 @@ static struct hid_field *hid_register_field(struct hid_report *report, unsignedreturn NULL ; } -if (!(field =kzalloc (sizeof (struct hid_field ) + usages *sizeof (struct hid_usage ) - + values *sizeof (unsigned ),GFP_KERNEL )))return NULL ; + field =kzalloc ((sizeof (struct hid_field ) + + usages *sizeof (struct hid_usage ) + + values *sizeof (unsigned )),GFP_KERNEL ); +if (!field) +return NULL ; field->index = report->maxfield++; report->field[field->index] = field;
@@ -211,7 +215,8 @@ static int hid_add_field(struct hid_parser *parser, unsigned report_type, unsignunsigned offset;int i; -if (!(report =hid_register_report (parser->device, report_type, parser->global.report_id))) { + report =hid_register_report (parser->device, report_type, parser->global.report_id); +if (!report) {dbg_hid ("hid_register_report failed\n" );return -1 ; }
@@ -229,7 +234,8 @@ static int hid_add_field(struct hid_parser *parser, unsigned report_type, unsign usages =max_t (int, parser->local.usage_index, parser->global.report_count); -if ((field =hid_register_field (report, usages, parser->global.report_count)) ==NULL ) + field =hid_register_field (report, usages, parser->global.report_count); +if (!field)return 0 ; field->physical =hid_lookup_collection (parser,HID_COLLECTION_PHYSICAL );
@@ -891,7 +897,8 @@ static void hid_input_field(struct hid_device *hid, struct hid_field *field,__s32 max = field->logical_maximum;__s32 *value; -if (!(value =kmalloc (sizeof (__s32) * count,GFP_ATOMIC ))) + value =kmalloc (sizeof (__s32) * count,GFP_ATOMIC ); +if (!value)return ;for (n =0 ; n < count; n++) {
Signature · 1 line
1.7.3.3.464.gf80b6
PATCH 6/6 hid: simplify an index check in hid_lookup_collection
In reply to Jiri KosinaSave the struct hid_collection * in a temporary to shorten the generated code a bit and perhaps improve readability.
$ size drivers/hid/hid-core.o* text data bss dec hex filename 16460 78 8 16546 40a2 drivers/hid/hid-core.o.new 16469 78 8 16555 40ab drivers/hid/hid-core.o.old
--- drivers/hid/hid-core.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-)
drivers/hid/hid-core.c +7 -3
@@ -178,10 +178,14 @@ static int close_collection(struct hid_parser *parser)static unsigned hid_lookup_collection (struct hid_parser *parser,unsigned type) { +struct hid_collection *collection = parser->device->collection;int n; -for (n = parser->collection_stack_ptr -1 ; n >=0 ; n--) -if (parser->device->collection[parser->collection_stack[n]].type == type) -return parser->device->collection[parser->collection_stack[n]].usage; + +for (n = parser->collection_stack_ptr -1 ; n >=0 ; n--) { +unsigned index = parser->collection_stack[n]; +if (collection[index].type == type) +return collection[index].usage; + }return 0 ;/* we know nothing about this usage type */ }
Signature · 1 line
1.7.3.3.464.gf80b6