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

Commit e51ff986 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "avtimer: Add compat ioctl support for avtimer"

parents fc53d716 8a40e10d

drivers/platform/msm/avtimer.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ struct avtimer_t { 
	struct class *avtimer_class;

	struct mutex avtimer_lock;

	int avtimer_open_cnt;

	struct dev_avtimer_data avtimer_pdata;

	wait_queue_head_t adsp_resp_wait;

	int enable_timer_resp_recieved;

	int timer_handle;
@@ -340,6 +339,7 @@ static long avtimer_ioctl(struct file *file, unsigned int ioctl_num, 


static const struct file_operations avtimer_fops = {

	.unlocked_ioctl = avtimer_ioctl,

	.compat_ioctl = avtimer_ioctl,

	.open = avtimer_open,

	.release = avtimer_release

};

include/uapi/linux/avtimer.h

+1 −10
Original line number Diff line number Diff line
@@ -5,15 +5,6 @@ 


#define MAJOR_NUM 100



#define IOCTL_GET_AVTIMER_TICK _IOR(MAJOR_NUM, 0, char *)

/*

 * This IOCTL is used read the avtimer tick value.

 * Avtimer is a 64 bit timer tick, hence the expected

 * argument is of type uint64_t

 */

struct dev_avtimer_data {

	uint32_t avtimer_msw_phy_addr;

	uint32_t avtimer_lsw_phy_addr;

};

#define IOCTL_GET_AVTIMER_TICK _IOR(MAJOR_NUM, 0, uint64_t)



#endif