Commit 5e022d1a authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] siano: use pr_* print functions 



Instead of defining its own set of printk functions, let's
use the common Kernel debug logic provided by pr_foo functions.

As a first step, let's just define the existing macros as the
Kernel ones.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 46b1e21f

drivers/media/common/siano/sms-cards.h

+2 −1
Original line number Diff line number Diff line
@@ -20,8 +20,9 @@ 
#ifndef __SMS_CARDS_H__

#define __SMS_CARDS_H__



#include <linux/usb.h>

#include "smscoreapi.h"



#include <linux/usb.h>

#include "smsir.h"



#define SMS_BOARD_UNKNOWN 0

drivers/media/common/siano/smscoreapi.c

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 */



#include "smscoreapi.h"



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/module.h>
@@ -34,7 +36,6 @@ 
#include <linux/wait.h>

#include <asm/byteorder.h>



#include "smscoreapi.h"

#include "sms-cards.h"

#include "smsir.h"

drivers/media/common/siano/smscoreapi.h

+12 −15
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. 
#ifndef __SMS_CORE_API_H__

#define __SMS_CORE_API_H__



#define pr_fmt(fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__



#include <linux/device.h>

#include <linux/list.h>

#include <linux/mm.h>
@@ -1177,22 +1179,17 @@ int smscore_led_state(struct smscore_device_t *core, int led); 
#define DBG_INFO 1

#define DBG_ADV  2



#define sms_printk(kern, fmt, arg...) \

	printk(kern "%s: " fmt "\n", __func__, ##arg)



#define dprintk(kern, lvl, fmt, arg...) do {\

	if (sms_dbg & lvl) \

		sms_printk(kern, fmt, ##arg); \

#define sms_log(fmt, arg...) pr_info(fmt "\n", ##arg)

#define sms_err(fmt, arg...) pr_err(fmt " on line: %d\n", ##arg, __LINE__)

#define sms_warn(fmt, arg...) pr_warn(fmt "\n", ##arg)

#define sms_info(fmt, arg...) do {\

	if (sms_dbg & DBG_INFO) \

		pr_info(fmt "\n", ##arg); \

} while (0)



#define sms_log(fmt, arg...) sms_printk(KERN_INFO, fmt, ##arg)

#define sms_err(fmt, arg...) \

	sms_printk(KERN_ERR, "line: %d: " fmt, __LINE__, ##arg)

#define sms_warn(fmt, arg...)  sms_printk(KERN_WARNING, fmt, ##arg)

#define sms_info(fmt, arg...) \

	dprintk(KERN_INFO, DBG_INFO, fmt, ##arg)

#define sms_debug(fmt, arg...) \

	dprintk(KERN_DEBUG, DBG_ADV, fmt, ##arg)



#define sms_debug(fmt, arg...) do {\

        if (sms_dbg & DBG_ADV) \

                printk(KERN_DEBUG pr_fmt(fmt "\n"), ##arg); \

} while (0)



#endif /* __SMS_CORE_API_H__ */

drivers/media/common/siano/smsdvb-debugfs.c

+1 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
 *

 ***********************************************************************/



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include "smscoreapi.h"



#include <linux/module.h>

#include <linux/slab.h>
@@ -31,8 +31,6 @@ 
#include "dvb_demux.h"

#include "dvb_frontend.h"



#include "smscoreapi.h"



#include "smsdvb.h"



static struct dentry *smsdvb_debugfs_usb_root;

drivers/media/common/siano/smsdvb-main.c

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. 


****************************************************************/



#include "smscoreapi.h"



#include <linux/module.h>

#include <linux/slab.h>

#include <linux/init.h>
@@ -29,7 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. 
#include "dvb_demux.h"

#include "dvb_frontend.h"



#include "smscoreapi.h"

#include "sms-cards.h"



#include "smsdvb.h"