aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>2016-11-30 20:00:28 -0500
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2016-11-30 20:42:18 -0500
commite9dade4106e1c1ff4ae91386b9812ee8f51c3775 (patch)
tree1028bfd882e7a916a92e7e2b3db37daf318859a7
parente155d4ee0b878c857f91deb14d6d7dba55c38648 (diff)
Input: synaptics-rmi4 - remove EXPORT_SYMBOL_GPL for internal functions
those functions should not be used outside of rmi_core.ko. There is no point in exporting them to the world. It looks like rmi_read_pdt_entry() should be static too. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--drivers/input/rmi4/rmi_driver.c15
-rw-r--r--drivers/input/rmi4/rmi_driver.h3
2 files changed, 2 insertions, 16 deletions
diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c
index 27c731ab71b8..a718e51afb0b 100644
--- a/drivers/input/rmi4/rmi_driver.c
+++ b/drivers/input/rmi4/rmi_driver.c
@@ -59,7 +59,6 @@ void rmi_free_function_list(struct rmi_device *rmi_dev)
59 rmi_unregister_function(fn); 59 rmi_unregister_function(fn);
60 } 60 }
61} 61}
62EXPORT_SYMBOL_GPL(rmi_free_function_list);
63 62
64static int reset_one_function(struct rmi_function *fn) 63static int reset_one_function(struct rmi_function *fn)
65{ 64{
@@ -309,7 +308,6 @@ int rmi_enable_sensor(struct rmi_device *rmi_dev)
309 308
310 return rmi_process_interrupt_requests(rmi_dev); 309 return rmi_process_interrupt_requests(rmi_dev);
311} 310}
312EXPORT_SYMBOL_GPL(rmi_enable_sensor);
313 311
314/** 312/**
315 * rmi_driver_set_input_params - set input device id and other data. 313 * rmi_driver_set_input_params - set input device id and other data.
@@ -431,8 +429,8 @@ static int rmi_driver_reset_handler(struct rmi_device *rmi_dev)
431 return 0; 429 return 0;
432} 430}
433 431
434int rmi_read_pdt_entry(struct rmi_device *rmi_dev, struct pdt_entry *entry, 432static int rmi_read_pdt_entry(struct rmi_device *rmi_dev,
435 u16 pdt_address) 433 struct pdt_entry *entry, u16 pdt_address)
436{ 434{
437 u8 buf[RMI_PDT_ENTRY_SIZE]; 435 u8 buf[RMI_PDT_ENTRY_SIZE];
438 int error; 436 int error;
@@ -455,7 +453,6 @@ int rmi_read_pdt_entry(struct rmi_device *rmi_dev, struct pdt_entry *entry,
455 453
456 return 0; 454 return 0;
457} 455}
458EXPORT_SYMBOL_GPL(rmi_read_pdt_entry);
459 456
460static void rmi_driver_copy_pdt_to_fd(const struct pdt_entry *pdt, 457static void rmi_driver_copy_pdt_to_fd(const struct pdt_entry *pdt,
461 struct rmi_function_descriptor *fd) 458 struct rmi_function_descriptor *fd)
@@ -532,7 +529,6 @@ int rmi_scan_pdt(struct rmi_device *rmi_dev, void *ctx,
532 529
533 return retval < 0 ? retval : 0; 530 return retval < 0 ? retval : 0;
534} 531}
535EXPORT_SYMBOL_GPL(rmi_scan_pdt);
536 532
537int rmi_read_register_desc(struct rmi_device *d, u16 addr, 533int rmi_read_register_desc(struct rmi_device *d, u16 addr,
538 struct rmi_register_descriptor *rdesc) 534 struct rmi_register_descriptor *rdesc)
@@ -664,7 +660,6 @@ free_struct_buff:
664 kfree(struct_buf); 660 kfree(struct_buf);
665 return ret; 661 return ret;
666} 662}
667EXPORT_SYMBOL_GPL(rmi_read_register_desc);
668 663
669const struct rmi_register_desc_item *rmi_get_register_desc_item( 664const struct rmi_register_desc_item *rmi_get_register_desc_item(
670 struct rmi_register_descriptor *rdesc, u16 reg) 665 struct rmi_register_descriptor *rdesc, u16 reg)
@@ -680,7 +675,6 @@ const struct rmi_register_desc_item *rmi_get_register_desc_item(
680 675
681 return NULL; 676 return NULL;
682} 677}
683EXPORT_SYMBOL_GPL(rmi_get_register_desc_item);
684 678
685size_t rmi_register_desc_calc_size(struct rmi_register_descriptor *rdesc) 679size_t rmi_register_desc_calc_size(struct rmi_register_descriptor *rdesc)
686{ 680{
@@ -694,7 +688,6 @@ size_t rmi_register_desc_calc_size(struct rmi_register_descriptor *rdesc)
694 } 688 }
695 return size; 689 return size;
696} 690}
697EXPORT_SYMBOL_GPL(rmi_register_desc_calc_size);
698 691
699/* Compute the register offset relative to the base address */ 692/* Compute the register offset relative to the base address */
700int rmi_register_desc_calc_reg_offset( 693int rmi_register_desc_calc_reg_offset(
@@ -712,7 +705,6 @@ int rmi_register_desc_calc_reg_offset(
712 } 705 }
713 return -1; 706 return -1;
714} 707}
715EXPORT_SYMBOL_GPL(rmi_register_desc_calc_reg_offset);
716 708
717bool rmi_register_desc_has_subpacket(const struct rmi_register_desc_item *item, 709bool rmi_register_desc_has_subpacket(const struct rmi_register_desc_item *item,
718 u8 subpacket) 710 u8 subpacket)
@@ -796,7 +788,6 @@ int rmi_initial_reset(struct rmi_device *rmi_dev, void *ctx,
796 /* F01 should always be on page 0. If we don't find it there, fail. */ 788 /* F01 should always be on page 0. If we don't find it there, fail. */
797 return pdt->page_start == 0 ? RMI_SCAN_CONTINUE : -ENODEV; 789 return pdt->page_start == 0 ? RMI_SCAN_CONTINUE : -ENODEV;
798} 790}
799EXPORT_SYMBOL_GPL(rmi_initial_reset);
800 791
801static int rmi_create_function(struct rmi_device *rmi_dev, 792static int rmi_create_function(struct rmi_device *rmi_dev,
802 void *ctx, const struct pdt_entry *pdt) 793 void *ctx, const struct pdt_entry *pdt)
@@ -1015,7 +1006,6 @@ int rmi_probe_interrupts(struct rmi_driver_data *data)
1015 1006
1016 return retval; 1007 return retval;
1017} 1008}
1018EXPORT_SYMBOL_GPL(rmi_probe_interrupts);
1019 1009
1020int rmi_init_functions(struct rmi_driver_data *data) 1010int rmi_init_functions(struct rmi_driver_data *data)
1021{ 1011{
@@ -1054,7 +1044,6 @@ err_destroy_functions:
1054 rmi_free_function_list(rmi_dev); 1044 rmi_free_function_list(rmi_dev);
1055 return retval; 1045 return retval;
1056} 1046}
1057EXPORT_SYMBOL_GPL(rmi_init_functions);
1058 1047
1059static int rmi_driver_probe(struct device *dev) 1048static int rmi_driver_probe(struct device *dev)
1060{ 1049{
diff --git a/drivers/input/rmi4/rmi_driver.h b/drivers/input/rmi4/rmi_driver.h
index c9fe3d3deef3..cc9458522279 100644
--- a/drivers/input/rmi4/rmi_driver.h
+++ b/drivers/input/rmi4/rmi_driver.h
@@ -51,9 +51,6 @@ struct pdt_entry {
51 u8 function_number; 51 u8 function_number;
52}; 52};
53 53
54int rmi_read_pdt_entry(struct rmi_device *rmi_dev, struct pdt_entry *entry,
55 u16 pdt_address);
56
57#define RMI_REG_DESC_PRESENSE_BITS (32 * BITS_PER_BYTE) 54#define RMI_REG_DESC_PRESENSE_BITS (32 * BITS_PER_BYTE)
58#define RMI_REG_DESC_SUBPACKET_BITS (37 * BITS_PER_BYTE) 55#define RMI_REG_DESC_SUBPACKET_BITS (37 * BITS_PER_BYTE)
59 56