summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@maxwell.research.nokia.com>2012-05-15 16:02:48 +0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-05-15 17:06:58 +0200
commitb89225a1c803d50271f86be15ecfccc0b0215007 (patch)
treeaf48dfef66cc44e0c9fe0410e996da3171e99fd2
parent[media] cx231xx: replace open-coded ARRAY_SIZE with macro (diff)
downloadlinux-b89225a1c803d50271f86be15ecfccc0b0215007.tar.xz
linux-b89225a1c803d50271f86be15ecfccc0b0215007.zip
[media] smiapp: Remove smiapp-debug.h in favour of dynamic debug
Remove smiapp-debug.h and let people use CONFIG_DYNAMIC_DEBUG instead. The option only affected to when debug information was being printed. Signed-off-by: Sakari Ailus <sakari.ailus@maxwell.research.nokia.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/smiapp-pll.c2
-rw-r--r--drivers/media/video/smiapp/Kconfig7
-rw-r--r--drivers/media/video/smiapp/smiapp-core.c2
-rw-r--r--drivers/media/video/smiapp/smiapp-debug.h32
-rw-r--r--drivers/media/video/smiapp/smiapp-quirk.c2
-rw-r--r--drivers/media/video/smiapp/smiapp-regs.c2
6 files changed, 0 insertions, 47 deletions
diff --git a/drivers/media/video/smiapp-pll.c b/drivers/media/video/smiapp-pll.c
index 501da413dfad..a416e27a4282 100644
--- a/drivers/media/video/smiapp-pll.c
+++ b/drivers/media/video/smiapp-pll.c
@@ -22,8 +22,6 @@
*
*/
-#include "smiapp/smiapp-debug.h"
-
#include <linux/gcd.h>
#include <linux/lcm.h>
#include <linux/module.h>
diff --git a/drivers/media/video/smiapp/Kconfig b/drivers/media/video/smiapp/Kconfig
index 9504c436a5ca..f7b35ff443bf 100644
--- a/drivers/media/video/smiapp/Kconfig
+++ b/drivers/media/video/smiapp/Kconfig
@@ -4,10 +4,3 @@ config VIDEO_SMIAPP
select VIDEO_SMIAPP_PLL
---help---
This is a generic driver for SMIA++/SMIA camera modules.
-
-config VIDEO_SMIAPP_DEBUG
- bool "Enable debugging for the generic SMIA++/SMIA driver"
- depends on VIDEO_SMIAPP
- ---help---
- Enable debugging output in the generic SMIA++/SMIA driver. If you
- are developing the driver you might want to enable this.
diff --git a/drivers/media/video/smiapp/smiapp-core.c b/drivers/media/video/smiapp/smiapp-core.c
index 3991c452acb2..a8a1db9563b1 100644
--- a/drivers/media/video/smiapp/smiapp-core.c
+++ b/drivers/media/video/smiapp/smiapp-core.c
@@ -26,8 +26,6 @@
*
*/
-#include "smiapp-debug.h"
-
#include <linux/delay.h>
#include <linux/device.h>
#include <linux/gpio.h>
diff --git a/drivers/media/video/smiapp/smiapp-debug.h b/drivers/media/video/smiapp/smiapp-debug.h
deleted file mode 100644
index 627809eed1d9..000000000000
--- a/drivers/media/video/smiapp/smiapp-debug.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * drivers/media/video/smiapp/smiapp-debug.h
- *
- * Generic driver for SMIA/SMIA++ compliant camera modules
- *
- * Copyright (C) 2011--2012 Nokia Corporation
- * Contact: Sakari Ailus <sakari.ailus@maxwell.research.nokia.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- */
-
-#ifndef SMIAPP_DEBUG_H
-#define SMIAPP_DEBUG_H
-
-#ifdef CONFIG_VIDEO_SMIAPP_DEBUG
-#define DEBUG
-#endif
-
-#endif
diff --git a/drivers/media/video/smiapp/smiapp-quirk.c b/drivers/media/video/smiapp/smiapp-quirk.c
index dae85a12f7ec..fb018de4bfa8 100644
--- a/drivers/media/video/smiapp/smiapp-quirk.c
+++ b/drivers/media/video/smiapp/smiapp-quirk.c
@@ -22,8 +22,6 @@
*
*/
-#include "smiapp-debug.h"
-
#include <linux/delay.h>
#include "smiapp.h"
diff --git a/drivers/media/video/smiapp/smiapp-regs.c b/drivers/media/video/smiapp/smiapp-regs.c
index 4851ff710779..a5055f18091f 100644
--- a/drivers/media/video/smiapp/smiapp-regs.c
+++ b/drivers/media/video/smiapp/smiapp-regs.c
@@ -22,8 +22,6 @@
*
*/
-#include "smiapp-debug.h"
-
#include <linux/delay.h>
#include <linux/i2c.h>