diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-03-30 19:53:56 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2008-04-22 05:34:58 -0400 |
commit | abdff0f7749a6696ba2a4238b675cbc55abcdb7a (patch) | |
tree | 6bb90322f9d47a273f8619d8fce9505d31e299c9 | |
parent | b54ec3c13cf77d21bab25d8bb117f642561fdf4f (diff) |
HID: make hid_input_field and usbhid_modify_dquirk static
This patch makes the following needlessly global functions static:
- hid-core.c:hid_input_field()
- usbhid/hid-quirks.c:usbhid_modify_dquirk()
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r-- | drivers/hid/hid-core.c | 4 | ||||
-rw-r--r-- | drivers/hid/usbhid/hid-quirks.c | 4 | ||||
-rw-r--r-- | include/linux/hid.h | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 10f925b892d7..e03c67dd3e63 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -830,7 +830,8 @@ static void hid_process_event(struct hid_device *hid, struct hid_field *field, s | |||
830 | * reporting to the layer). | 830 | * reporting to the layer). |
831 | */ | 831 | */ |
832 | 832 | ||
833 | void hid_input_field(struct hid_device *hid, struct hid_field *field, __u8 *data, int interrupt) | 833 | static void hid_input_field(struct hid_device *hid, struct hid_field *field, |
834 | __u8 *data, int interrupt) | ||
834 | { | 835 | { |
835 | unsigned n; | 836 | unsigned n; |
836 | unsigned count = field->report_count; | 837 | unsigned count = field->report_count; |
@@ -876,7 +877,6 @@ void hid_input_field(struct hid_device *hid, struct hid_field *field, __u8 *data | |||
876 | exit: | 877 | exit: |
877 | kfree(value); | 878 | kfree(value); |
878 | } | 879 | } |
879 | EXPORT_SYMBOL_GPL(hid_input_field); | ||
880 | 880 | ||
881 | /* | 881 | /* |
882 | * Output the field into the report. | 882 | * Output the field into the report. |
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index 6ad33fe2c165..433feb67ca1a 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c | |||
@@ -809,8 +809,8 @@ static struct hid_blacklist *usbhid_exists_dquirk(const u16 idVendor, | |||
809 | * | 809 | * |
810 | * Returns: 0 OK, -error on failure. | 810 | * Returns: 0 OK, -error on failure. |
811 | */ | 811 | */ |
812 | int usbhid_modify_dquirk(const u16 idVendor, const u16 idProduct, | 812 | static int usbhid_modify_dquirk(const u16 idVendor, const u16 idProduct, |
813 | const u32 quirks) | 813 | const u32 quirks) |
814 | { | 814 | { |
815 | struct quirks_list_struct *q_new, *q; | 815 | struct quirks_list_struct *q_new, *q; |
816 | int list_edited = 0; | 816 | int list_edited = 0; |
diff --git a/include/linux/hid.h b/include/linux/hid.h index cd526af12d7b..fe4ac31eced2 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h | |||
@@ -531,14 +531,12 @@ int hidinput_find_field(struct hid_device *hid, unsigned int type, unsigned int | |||
531 | int hidinput_mapping_quirks(struct hid_usage *, struct input_dev *, unsigned long **, int *); | 531 | int hidinput_mapping_quirks(struct hid_usage *, struct input_dev *, unsigned long **, int *); |
532 | int hidinput_event_quirks(struct hid_device *, struct hid_field *, struct hid_usage *, __s32); | 532 | int hidinput_event_quirks(struct hid_device *, struct hid_field *, struct hid_usage *, __s32); |
533 | int hidinput_apple_event(struct hid_device *, struct input_dev *, struct hid_usage *, __s32); | 533 | int hidinput_apple_event(struct hid_device *, struct input_dev *, struct hid_usage *, __s32); |
534 | void hid_input_field(struct hid_device *hid, struct hid_field *field, __u8 *data, int interrupt); | ||
535 | void hid_output_report(struct hid_report *report, __u8 *data); | 534 | void hid_output_report(struct hid_report *report, __u8 *data); |
536 | void hid_free_device(struct hid_device *device); | 535 | void hid_free_device(struct hid_device *device); |
537 | struct hid_device *hid_parse_report(__u8 *start, unsigned size); | 536 | struct hid_device *hid_parse_report(__u8 *start, unsigned size); |
538 | 537 | ||
539 | /* HID quirks API */ | 538 | /* HID quirks API */ |
540 | u32 usbhid_lookup_quirk(const u16 idVendor, const u16 idProduct); | 539 | u32 usbhid_lookup_quirk(const u16 idVendor, const u16 idProduct); |
541 | int usbhid_modify_dquirk(const u16 idVendor, const u16 idProduct, const u32 quirks); | ||
542 | int usbhid_quirks_init(char **quirks_param); | 540 | int usbhid_quirks_init(char **quirks_param); |
543 | void usbhid_quirks_exit(void); | 541 | void usbhid_quirks_exit(void); |
544 | void usbhid_fixup_report_descriptor(const u16, const u16, char *, unsigned, char **); | 542 | void usbhid_fixup_report_descriptor(const u16, const u16, char *, unsigned, char **); |