[RESEND PATCH 11/14] staging/media/as102: fix compile warning about unused function

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Patch taken from http://kernellabs.com/hg/~dheitmueller/v4l-dvb-as102-2/

Original source and comment:
# HG changeset patch
# User Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
# Date 1267319685 18000
# Node ID 84b93826c0a19efa114a6808165f91390cb86daa
# Parent  22ef1bdca69a2781abf397c53a0f7f6125f5359a
as102: fix compile warning about unused function

From: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>

The function in question is only used on old kernels, so we had the call to
the function #ifdef'd, but the definition of the function was stil being
included.

Priority: normal

Signed-off-by: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
Signed-off-by: Piotr Chmura <chmooreck@xxxxxxxxxxxxxx>

diff --git linux/drivers/staging/media/as102/as102_fe.c linuxb/drivers/staging/media/as102/as102_fe.c
--- linux/drivers/staging/media/as102/as102_fe.c
+++ linuxb/drivers/staging/media/as102/as102_fe.c
@@ -32,6 +32,7 @@
 static void as102_fe_copy_tune_parameters(struct as10x_tune_args *dst,
 					  struct dvb_frontend_parameters *src);
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
 static void as102_fe_release(struct dvb_frontend *fe)
 {
 	struct as102_dev_t *dev;
@@ -42,7 +43,6 @@
 	if (dev == NULL)
 		return;
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
 	if (mutex_lock_interruptible(&dev->bus_adap.lock))
 		return;
 
@@ -50,7 +50,6 @@
 	as10x_cmd_turn_off(&dev->bus_adap);
 
 	mutex_unlock(&dev->bus_adap.lock);
-#endif
 
 	/* release frontend callback ops */
 	memset(&fe->ops, 0, sizeof(struct dvb_frontend_ops));
@@ -66,7 +65,6 @@
 	LEAVE();
 }
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
 static int as102_fe_init(struct dvb_frontend *fe)
 {
 	int ret = 0;
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Input]     [Video for Linux]     [Gstreamer Embedded]     [Mplayer Users]     [Linux USB Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux