diff options
author | Kenneth Kwak <kkwak@nvidia.com> | 2014-06-24 21:36:02 -0700 |
---|---|---|
committer | Peter Kim <pekim@nvidia.com> | 2014-06-25 19:11:02 -0700 |
commit | a3ed1fae3af45fc85b96ff2a4180977482c8235b (patch) | |
tree | 159687d8ce2612337c1ef64a9f0e6aa26e2e5b8d | |
parent | 45619115cebae2d5f3344a08476a1e09ea031c75 (diff) |
Revert "HID: Exporting hidinput_calc_ads_res"
DO NOT INTEGRATE
Bug 1466757
This reverts commit e5ab87ee1c4f0c3f8557ddde3be07d43b94aae07.
Change-Id: I2805688d8be8b2b3bc67e408a5556970f38bd0af
Signed-off-by: Kenneth Kwak <kkwak@nvidia.com>
Reviewed-on: http://git-master/r/428075
Reviewed-by: Peter Kim <pekim@nvidia.com>
Tested-by: Peter Kim <pekim@nvidia.com>
-rw-r--r-- | drivers/hid/hid-input.c | 3 | ||||
-rw-r--r-- | include/linux/hid.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index 89eeb6d61329..43669731afc9 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -208,7 +208,7 @@ static int hidinput_setkeycode(struct input_dev *dev, * Only exponent 1 length units are processed. Centimeters and inches are * converted to millimeters. Degrees are converted to radians. */ -__s32 hidinput_calc_abs_res(const struct hid_field *field, __u16 code) +static __s32 hidinput_calc_abs_res(const struct hid_field *field, __u16 code) { __s32 unit_exponent = field->unit_exponent; __s32 logical_extents = field->logical_maximum - @@ -272,7 +272,6 @@ __s32 hidinput_calc_abs_res(const struct hid_field *field, __u16 code) /* Calculate resolution */ return logical_extents / physical_extents; } -EXPORT_SYMBOL_GPL(hidinput_calc_abs_res); #ifdef CONFIG_HID_BATTERY_STRENGTH static enum power_supply_property hidinput_battery_props[] = { diff --git a/include/linux/hid.h b/include/linux/hid.h index 944e21cfc4d6..f8dd77457ec0 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -740,7 +740,6 @@ int hid_input_report(struct hid_device *, int type, u8 *, int, int); int hidinput_find_field(struct hid_device *hid, unsigned int type, unsigned int code, struct hid_field **field); struct hid_field *hidinput_get_led_field(struct hid_device *hid); unsigned int hidinput_count_leds(struct hid_device *hid); -__s32 hidinput_calc_abs_res(const struct hid_field *field, __u16 code); void hid_output_report(struct hid_report *report, __u8 *data); struct hid_device *hid_allocate_device(void); struct hid_report *hid_register_report(struct hid_device *device, unsigned type, unsigned id); |