Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9dade41 authored by Benjamin Tissoires's avatar Benjamin Tissoires Committed by Dmitry Torokhov
Browse files

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: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent e155d4ee

drivers/input/rmi4/rmi_driver.c

+2 −13
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ void rmi_free_function_list(struct rmi_device *rmi_dev) 
		rmi_unregister_function(fn);

	}

}

EXPORT_SYMBOL_GPL(rmi_free_function_list);



static int reset_one_function(struct rmi_function *fn)

{
@@ -309,7 +308,6 @@ int rmi_enable_sensor(struct rmi_device *rmi_dev) 


	return rmi_process_interrupt_requests(rmi_dev);

}

EXPORT_SYMBOL_GPL(rmi_enable_sensor);



/**

 * 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) 
	return 0;

}



int rmi_read_pdt_entry(struct rmi_device *rmi_dev, struct pdt_entry *entry,

			u16 pdt_address)

static int rmi_read_pdt_entry(struct rmi_device *rmi_dev,

			      struct pdt_entry *entry, u16 pdt_address)

{

	u8 buf[RMI_PDT_ENTRY_SIZE];

	int error;
@@ -455,7 +453,6 @@ int rmi_read_pdt_entry(struct rmi_device *rmi_dev, struct pdt_entry *entry, 


	return 0;

}

EXPORT_SYMBOL_GPL(rmi_read_pdt_entry);



static void rmi_driver_copy_pdt_to_fd(const struct pdt_entry *pdt,

				      struct rmi_function_descriptor *fd)
@@ -532,7 +529,6 @@ int rmi_scan_pdt(struct rmi_device *rmi_dev, void *ctx, 


	return retval < 0 ? retval : 0;

}

EXPORT_SYMBOL_GPL(rmi_scan_pdt);



int rmi_read_register_desc(struct rmi_device *d, u16 addr,

				struct rmi_register_descriptor *rdesc)
@@ -664,7 +660,6 @@ int rmi_read_register_desc(struct rmi_device *d, u16 addr, 
	kfree(struct_buf);

	return ret;

}

EXPORT_SYMBOL_GPL(rmi_read_register_desc);



const struct rmi_register_desc_item *rmi_get_register_desc_item(

				struct rmi_register_descriptor *rdesc, u16 reg)
@@ -680,7 +675,6 @@ const struct rmi_register_desc_item *rmi_get_register_desc_item( 


	return NULL;

}

EXPORT_SYMBOL_GPL(rmi_get_register_desc_item);



size_t rmi_register_desc_calc_size(struct rmi_register_descriptor *rdesc)

{
@@ -694,7 +688,6 @@ size_t rmi_register_desc_calc_size(struct rmi_register_descriptor *rdesc) 
	}

	return size;

}

EXPORT_SYMBOL_GPL(rmi_register_desc_calc_size);



/* Compute the register offset relative to the base address */

int rmi_register_desc_calc_reg_offset(
@@ -712,7 +705,6 @@ int rmi_register_desc_calc_reg_offset( 
	}

	return -1;

}

EXPORT_SYMBOL_GPL(rmi_register_desc_calc_reg_offset);



bool rmi_register_desc_has_subpacket(const struct rmi_register_desc_item *item,

	u8 subpacket)
@@ -796,7 +788,6 @@ int rmi_initial_reset(struct rmi_device *rmi_dev, void *ctx, 
	/* F01 should always be on page 0. If we don't find it there, fail. */

	return pdt->page_start == 0 ? RMI_SCAN_CONTINUE : -ENODEV;

}

EXPORT_SYMBOL_GPL(rmi_initial_reset);



static int rmi_create_function(struct rmi_device *rmi_dev,

			       void *ctx, const struct pdt_entry *pdt)
@@ -1015,7 +1006,6 @@ int rmi_probe_interrupts(struct rmi_driver_data *data) 


	return retval;

}

EXPORT_SYMBOL_GPL(rmi_probe_interrupts);



int rmi_init_functions(struct rmi_driver_data *data)

{
@@ -1054,7 +1044,6 @@ int rmi_init_functions(struct rmi_driver_data *data) 
	rmi_free_function_list(rmi_dev);

	return retval;

}

EXPORT_SYMBOL_GPL(rmi_init_functions);



static int rmi_driver_probe(struct device *dev)

{

drivers/input/rmi4/rmi_driver.h

+0 −3
Original line number Diff line number Diff line
@@ -51,9 +51,6 @@ struct pdt_entry { 
	u8 function_number;

};



int rmi_read_pdt_entry(struct rmi_device *rmi_dev, struct pdt_entry *entry,

			u16 pdt_address);



#define RMI_REG_DESC_PRESENSE_BITS	(32 * BITS_PER_BYTE)

#define RMI_REG_DESC_SUBPACKET_BITS	(37 * BITS_PER_BYTE)