Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e39682b5 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] cx23885: convert it to use pr_foo() macros 



Instead of calling printk() directly, use pr_foo()
macros, as suggested at the Kernel's coding style.

Please notice that a conversion to dev_foo() is not trivial,
as several parts on this driver uses pr_cont().

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent f1dc10b6

drivers/media/pci/cx23885/altera-ci.c

+10 −5
Original line number Diff line number Diff line
@@ -48,6 +48,9 @@ 
 * |  DATA7|  DATA6|  DATA5|  DATA4|  DATA3|  DATA2|  DATA1|  DATA0|

 * +-------+-------+-------+-------+-------+-------+-------+-------+

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <dvb_demux.h>

#include <dvb_frontend.h>

#include "altera-ci.h"
@@ -84,16 +87,18 @@ MODULE_DESCRIPTION("altera FPGA CI module"); 
MODULE_AUTHOR("Igor M. Liplianin  <liplianin@netup.ru>");

MODULE_LICENSE("GPL");



#define ci_dbg_print(args...) \

#define ci_dbg_print(fmt, args...) \

	do { \

		if (ci_dbg) \

			printk(KERN_DEBUG args); \

			printk(KERN_DEBUG pr_fmt("%s: " fmt), \

			       __func__, ##args); \

	} while (0)



#define pid_dbg_print(args...) \

#define pid_dbg_print(fmt, args...) \

	do { \

		if (pid_dbg) \

			printk(KERN_DEBUG args); \

			printk(KERN_DEBUG pr_fmt("%s: " fmt), \

			       __func__, ##args); \

	} while (0)



struct altera_ci_state;

drivers/media/pci/cx23885/altera-ci.h

+7 −7
Original line number Diff line number Diff line
@@ -48,24 +48,24 @@ extern int altera_ci_tuner_reset(void *dev, int ci_nr); 


static inline int altera_ci_init(struct altera_ci_config *config, int ci_nr)

{

	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);

	pr_warn("%s: driver disabled by Kconfig\n", __func__);

	return 0;

}



static inline void altera_ci_release(void *dev, int ci_nr)

{

	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);

	pr_warn("%s: driver disabled by Kconfig\n", __func__);

}



static inline int altera_ci_irq(void *dev)

{

	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);

	pr_warn("%s: driver disabled by Kconfig\n", __func__);

	return 0;

}



static inline int altera_ci_tuner_reset(void *dev, int ci_nr)

{

	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);

	pr_warn("%s: driver disabled by Kconfig\n", __func__);

	return 0;

}
@@ -74,19 +74,19 @@ static inline int altera_ci_tuner_reset(void *dev, int ci_nr) 
static inline int altera_hw_filt_init(struct altera_ci_config *config,

							int hw_filt_nr)

{

	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);

	pr_warn("%s: driver disabled by Kconfig\n", __func__);

	return 0;

}



static inline void altera_hw_filt_release(void *dev, int filt_nr)

{

	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);

	pr_warn("%s: driver disabled by Kconfig\n", __func__);

}



static inline int altera_pid_feed_control(void *dev, int filt_nr,

		struct dvb_demux_feed *dvbdmxfeed, int onoff)

{

	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);

	pr_warn("%s: driver disabled by Kconfig\n", __func__);

	return 0;

}

drivers/media/pci/cx23885/cimax2.c

+4 −4
Original line number Diff line number Diff line
@@ -65,10 +65,11 @@ static unsigned int ci_irq_enable; 
module_param(ci_irq_enable, int, 0644);

MODULE_PARM_DESC(ci_irq_enable, "Enable IRQ from CAM");



#define ci_dbg_print(args...) \

#define ci_dbg_print(fmt, args...) \

	do { \

		if (ci_dbg) \

			printk(KERN_DEBUG args); \

			printk(KERN_DEBUG pr_fmt("%s: " fmt), \

			       __func__, ##args); \

	} while (0)



#define ci_irq_flags() (ci_irq_enable ? NETUP_IRQ_IRQAM : 0)
@@ -135,8 +136,7 @@ static int netup_write_i2c(struct i2c_adapter *i2c_adap, u8 addr, u8 reg, 
	};



	if (1 + len > sizeof(buffer)) {

		printk(KERN_WARNING

		       "%s: i2c wr reg=%04x: len=%d is too big!\n",

		pr_warn("%s: i2c wr reg=%04x: len=%d is too big!\n",

		       KBUILD_MODNAME, reg, len);

		return -EINVAL;

	}

drivers/media/pci/cx23885/cx23885-417.c

+26 −31
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ 
 *  GNU General Public License for more details.

 */



#include "cx23885.h"

#include "cx23885-ioctl.h"



#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/init.h>
@@ -32,9 +35,6 @@ 
#include <media/v4l2-ioctl.h>

#include <media/drv-intf/cx2341x.h>



#include "cx23885.h"

#include "cx23885-ioctl.h"



#define CX23885_FIRM_IMAGE_SIZE 376836

#define CX23885_FIRM_IMAGE_NAME "v4l-cx23885-enc.fw"
@@ -55,8 +55,8 @@ MODULE_PARM_DESC(v4l_debug, "enable V4L debug messages"); 


#define dprintk(level, fmt, arg...)\

	do { if (v4l_debug >= level) \

		printk(KERN_DEBUG "%s: " fmt, \

		(dev) ? dev->name : "cx23885[?]", ## arg); \

		printk(KERN_DEBUG pr_fmt("%s: 417:" fmt), \

			__func__, ##arg); \

	} while (0)



static struct cx23885_tvnorm cx23885_tvnorms[] = {
@@ -769,8 +769,7 @@ static int cx23885_mbox_func(void *priv, 
	   without side effects */

	mc417_memory_read(dev, dev->cx23417_mailbox - 4, &value);

	if (value != 0x12345678) {

		printk(KERN_ERR

			"Firmware and/or mailbox pointer not initialized or corrupted, signature = 0x%x, cmd = %s\n",

		pr_err("Firmware and/or mailbox pointer not initialized or corrupted, signature = 0x%x, cmd = %s\n",

			value, cmd_to_str(command));

		return -1;

	}
@@ -780,7 +779,7 @@ static int cx23885_mbox_func(void *priv, 
	 */

	mc417_memory_read(dev, dev->cx23417_mailbox, &flag);

	if (flag) {

		printk(KERN_ERR "ERROR: Mailbox appears to be in use (%x), cmd = %s\n",

		pr_err("ERROR: Mailbox appears to be in use (%x), cmd = %s\n",

		       flag, cmd_to_str(command));

		return -1;

	}
@@ -810,7 +809,7 @@ static int cx23885_mbox_func(void *priv, 
		if (0 != (flag & 4))

			break;

		if (time_after(jiffies, timeout)) {

			printk(KERN_ERR "ERROR: API Mailbox timeout\n");

			pr_err("ERROR: API Mailbox timeout\n");

			return -1;

		}

		udelay(10);
@@ -887,7 +886,7 @@ static int cx23885_find_mailbox(struct cx23885_dev *dev) 
			return i+1;

		}

	}

	printk(KERN_ERR "Mailbox signature values not found!\n");

	pr_err("Mailbox signature values not found!\n");

	return -1;

}
@@ -922,7 +921,7 @@ static int cx23885_load_firmware(struct cx23885_dev *dev) 
		IVTV_REG_APU, 0);



	if (retval != 0) {

		printk(KERN_ERR "%s: Error with mc417_register_write\n",

		pr_err("%s: Error with mc417_register_write\n",

			__func__);

		return -1;

	}
@@ -931,23 +930,21 @@ static int cx23885_load_firmware(struct cx23885_dev *dev) 
				  &dev->pci->dev);



	if (retval != 0) {

		printk(KERN_ERR

			"ERROR: Hotplug firmware request failed (%s).\n",

		pr_err("ERROR: Hotplug firmware request failed (%s).\n",

		       CX23885_FIRM_IMAGE_NAME);

		printk(KERN_ERR "Please fix your hotplug setup, the board will not work without firmware loaded!\n");

		pr_err("Please fix your hotplug setup, the board will not work without firmware loaded!\n");

		return -1;

	}



	if (firmware->size != CX23885_FIRM_IMAGE_SIZE) {

		printk(KERN_ERR "ERROR: Firmware size mismatch (have %zu, expected %d)\n",

		pr_err("ERROR: Firmware size mismatch (have %zu, expected %d)\n",

		       firmware->size, CX23885_FIRM_IMAGE_SIZE);

		release_firmware(firmware);

		return -1;

	}



	if (0 != memcmp(firmware->data, magic, 8)) {

		printk(KERN_ERR

			"ERROR: Firmware magic mismatch, wrong file?\n");

		pr_err("ERROR: Firmware magic mismatch, wrong file?\n");

		release_firmware(firmware);

		return -1;

	}
@@ -959,7 +956,7 @@ static int cx23885_load_firmware(struct cx23885_dev *dev) 
		value = *dataptr;

		checksum += ~value;

		if (mc417_memory_write(dev, i, value) != 0) {

			printk(KERN_ERR "ERROR: Loading firmware failed!\n");

			pr_err("ERROR: Loading firmware failed!\n");

			release_firmware(firmware);

			return -1;

		}
@@ -970,15 +967,14 @@ static int cx23885_load_firmware(struct cx23885_dev *dev) 
	dprintk(1, "Verifying firmware ...\n");

	for (i--; i >= 0; i--) {

		if (mc417_memory_read(dev, i, &value) != 0) {

			printk(KERN_ERR "ERROR: Reading firmware failed!\n");

			pr_err("ERROR: Reading firmware failed!\n");

			release_firmware(firmware);

			return -1;

		}

		checksum -= ~value;

	}

	if (checksum) {

		printk(KERN_ERR

			"ERROR: Firmware load failed (checksum mismatch).\n");

		pr_err("ERROR: Firmware load failed (checksum mismatch).\n");

		release_firmware(firmware);

		return -1;

	}
@@ -1003,7 +999,7 @@ static int cx23885_load_firmware(struct cx23885_dev *dev) 
	mc417_register_read(dev, 0x900C, &gpio_value);



	if (retval < 0)

		printk(KERN_ERR "%s: Error with mc417_register_write\n",

		pr_err("%s: Error with mc417_register_write\n",

			__func__);

	return 0;

}
@@ -1055,26 +1051,25 @@ static int cx23885_initialize_codec(struct cx23885_dev *dev, int startencoder) 
		dprintk(2, "%s() PING OK\n", __func__);

		retval = cx23885_load_firmware(dev);

		if (retval < 0) {

			printk(KERN_ERR "%s() f/w load failed\n", __func__);

			pr_err("%s() f/w load failed\n", __func__);

			return retval;

		}

		retval = cx23885_find_mailbox(dev);

		if (retval < 0) {

			printk(KERN_ERR "%s() mailbox < 0, error\n",

			pr_err("%s() mailbox < 0, error\n",

				__func__);

			return -1;

		}

		dev->cx23417_mailbox = retval;

		retval = cx23885_api_cmd(dev, CX2341X_ENC_PING_FW, 0, 0);

		if (retval < 0) {

			printk(KERN_ERR

				"ERROR: cx23417 firmware ping failed!\n");

			pr_err("ERROR: cx23417 firmware ping failed!\n");

			return -1;

		}

		retval = cx23885_api_cmd(dev, CX2341X_ENC_GET_VERSION, 0, 1,

			&version);

		if (retval < 0) {

			printk(KERN_ERR "ERROR: cx23417 firmware get encoder :version failed!\n");

			pr_err("ERROR: cx23417 firmware get encoder :version failed!\n");

			return -1;

		}

		dprintk(1, "cx23417 firmware version is 0x%08x\n", version);
@@ -1559,11 +1554,11 @@ int cx23885_417_register(struct cx23885_dev *dev) 
	err = video_register_device(dev->v4l_device,

		VFL_TYPE_GRABBER, -1);

	if (err < 0) {

		printk(KERN_INFO "%s: can't register mpeg device\n", dev->name);

		pr_info("%s: can't register mpeg device\n", dev->name);

		return err;

	}



	printk(KERN_INFO "%s: registered device %s [mpeg]\n",

	pr_info("%s: registered device %s [mpeg]\n",

	       dev->name, video_device_node_name(dev->v4l_device));



	/* ST: Configure the encoder paramaters, but don't begin

drivers/media/pci/cx23885/cx23885-alsa.c

+9 −12
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ 
 *  GNU General Public License for more details.

 */



#include "cx23885.h"

#include "cx23885-reg.h"



#include <linux/module.h>

#include <linux/init.h>

#include <linux/device.h>
@@ -35,20 +38,14 @@ 


#include <sound/tlv.h>





#include "cx23885.h"

#include "cx23885-reg.h"



#define AUDIO_SRAM_CHANNEL	SRAM_CH07



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

	if (audio_debug + 1 > level)					\

		printk(KERN_INFO "%s: " fmt, chip->dev->name , ## arg);	\

		printk(KERN_DEBUG pr_fmt("%s: alsa: " fmt), \

			chip->dev->name, ##arg); \

} while(0)



#define dprintk_core(level, fmt, arg...)	if (audio_debug >= level) \

	printk(KERN_DEBUG "%s: " fmt, chip->dev->name , ## arg)



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

			Module global static vars

 ****************************************************************************/
@@ -247,7 +244,7 @@ int cx23885_audio_irq(struct cx23885_dev *dev, u32 status, u32 mask) 


	/* risc op code error */

	if (status & AUD_INT_OPC_ERR) {

		printk(KERN_WARNING "%s/1: Audio risc op code error\n",

		pr_warn("%s/1: Audio risc op code error\n",

			dev->name);

		cx_clear(AUD_INT_DMA_CTL, 0x11);

		cx23885_sram_channel_dump(dev,
@@ -327,7 +324,7 @@ static int snd_cx23885_pcm_open(struct snd_pcm_substream *substream) 
	int err;



	if (!chip) {

		printk(KERN_ERR "BUG: cx23885 can't find device struct. Can't proceed with open\n");

		pr_err("BUG: cx23885 can't find device struct. Can't proceed with open\n");

		return -ENODEV;

	}
@@ -554,7 +551,7 @@ struct cx23885_audio_dev *cx23885_audio_register(struct cx23885_dev *dev) 
		return NULL;



	if (dev->sram_channels[AUDIO_SRAM_CHANNEL].cmds_start == 0) {

		printk(KERN_WARNING "%s(): Missing SRAM channel configuration for analog TV Audio\n",

		pr_warn("%s(): Missing SRAM channel configuration for analog TV Audio\n",

		       __func__);

		return NULL;

	}
@@ -589,7 +586,7 @@ struct cx23885_audio_dev *cx23885_audio_register(struct cx23885_dev *dev) 


error:

	snd_card_free(card);

	printk(KERN_ERR "%s(): Failed to register analog audio adapter\n",

	pr_err("%s(): Failed to register analog audio adapter\n",

	       __func__);



	return NULL;