From 8a6667f83442a2d051be1dfe253d5a5f31c9c1a8 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 5 Nov 2007 18:07:18 +0100 Subject: common/ir-functions.c: make a function static From: Adrian Bunk ir_rc5_decode() can become static. Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab --- linux/include/media/ir-common.h | 1 - 1 file changed, 1 deletion(-) (limited to 'linux/include/media') diff --git a/linux/include/media/ir-common.h b/linux/include/media/ir-common.h index 7a785fa77..b904d3257 100644 --- a/linux/include/media/ir-common.h +++ b/linux/include/media/ir-common.h @@ -97,7 +97,6 @@ int ir_dump_samples(u32 *samples, int count); int ir_decode_biphase(u32 *samples, int count, int low, int high); int ir_decode_pulsedistance(u32 *samples, int count, int low, int high); -u32 ir_rc5_decode(unsigned int code); void ir_rc5_timer_end(unsigned long data); void ir_rc5_timer_keyup(unsigned long data); -- cgit v1.2.3 From 48367f67743ac8d9ec4f445d6e8ef253467195cf Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 30 Oct 2007 10:52:52 +0200 Subject: V4L: Int if: Set slave's master before attach, remove master argument From: Sakari Ailus Set slave's master before master's attach call. The master also now gets its own pointer from slave's structure. Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab --- linux/include/media/v4l2-int-device.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'linux/include/media') diff --git a/linux/include/media/v4l2-int-device.h b/linux/include/media/v4l2-int-device.h index 066ebfc4f..c8b80e0f0 100644 --- a/linux/include/media/v4l2-int-device.h +++ b/linux/include/media/v4l2-int-device.h @@ -44,9 +44,8 @@ enum v4l2_int_type { struct v4l2_int_device; struct v4l2_int_master { - int (*attach)(struct v4l2_int_device *master, - struct v4l2_int_device *slave); - void (*detach)(struct v4l2_int_device *master); + int (*attach)(struct v4l2_int_device *slave); + void (*detach)(struct v4l2_int_device *slave); }; typedef int (v4l2_int_ioctl_func)(struct v4l2_int_device *); -- cgit v1.2.3