[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>

diff --git a/drivers/media/video/smiapp-pll.c b/drivers/media/video/smiapp-pll.c
index 501da413dfad32762ff1836aa0db081e3ba88e5c..a416e27a4282c0e8114219a838e1e883605f3961 100644 (file)
--- 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 9504c436a5ca0a975b6559b1fc3b442cf23c9c01..f7b35ff443bf976d192ee5522bbd765beb1a04cb 100644 (file)
--- 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 3991c452acb2c38af3628d155b69ba4cc47ead4a..a8a1db9563b1a60e6da85ce58c1501a39ca91354 100644 (file)
--- 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 (file)
index 627809e..0000000
--- 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 dae85a12f7ec5364bf019bbf7feb0cafb71cf9e3..fb018de4bfa8bbf889a1278b94552ec264c34e18 100644 (file)
--- 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 4851ff710779885b44a28dd25829a5f82262e49d..a5055f18091f7a6ab73284de5db46f9983146d78 100644 (file)
--- 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>