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

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

[media] saa7134: use pr_warn() on some places where no KERN_foo were used 



On a few places, mostly during board detection, some printk()
macros were called without especifying any message level.

Those are actually warnings. So, use pr_warn() for them.

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

drivers/media/pci/saa7134/saa7134-cards.c

+14 −14
Original line number Original line Diff line number Diff line
@@ -7159,7 +7159,7 @@ MODULE_DEVICE_TABLE(pci, saa7134_pci_tbl); 




static void board_flyvideo(struct saa7134_dev *dev)

static void board_flyvideo(struct saa7134_dev *dev)

{

{

	printk("%s: there are different flyvideo cards with different tuners\n"

	pr_warn("%s: there are different flyvideo cards with different tuners\n"

		"%s: out there, you might have to use the tuner=<nr> insmod\n"

		"%s: out there, you might have to use the tuner=<nr> insmod\n"

		"%s: option to override the default value.\n",

		"%s: option to override the default value.\n",

		dev->name, dev->name, dev->name);

		dev->name, dev->name, dev->name);
@@ -7513,7 +7513,7 @@ int saa7134_board_init1(struct saa7134_dev *dev) 
		dev->has_remote = SAA7134_REMOTE_GPIO;

		dev->has_remote = SAA7134_REMOTE_GPIO;

		break;

		break;

	case SAA7134_BOARD_MD5044:

	case SAA7134_BOARD_MD5044:

		printk("%s: seems there are two different versions of the MD5044\n"

		pr_warn("%s: seems there are two different versions of the MD5044\n"

			"%s: (with the same ID) out there.  If sound doesn't work for\n"

			"%s: (with the same ID) out there.  If sound doesn't work for\n"

			"%s: you try the audio_clock_override=0x200000 insmod option.\n",

			"%s: you try the audio_clock_override=0x200000 insmod option.\n",

			dev->name,dev->name,dev->name);

			dev->name,dev->name,dev->name);
@@ -7641,7 +7641,7 @@ int saa7134_board_init1(struct saa7134_dev *dev) 
		dev->has_remote = SAA7134_REMOTE_I2C;

		dev->has_remote = SAA7134_REMOTE_I2C;

		break;

		break;

	case SAA7134_BOARD_AVERMEDIA_A169_B:

	case SAA7134_BOARD_AVERMEDIA_A169_B:

		printk("%s: %s: dual saa713x broadcast decoders\n"

		pr_warn("%s: %s: dual saa713x broadcast decoders\n"

			"%s: Sorry, none of the inputs to this chip are supported yet.\n"

			"%s: Sorry, none of the inputs to this chip are supported yet.\n"

			"%s: Dual decoder functionality is disabled for now, use the other chip.\n",

			"%s: Dual decoder functionality is disabled for now, use the other chip.\n",

			dev->name,card(dev).name,dev->name,dev->name);

			dev->name,card(dev).name,dev->name,dev->name);
@@ -7790,7 +7790,7 @@ int saa7134_board_init2(struct saa7134_dev *dev) 
		if (board == dev->board)

		if (board == dev->board)

			break;

			break;

		dev->board = board;

		dev->board = board;

		printk("%s: board type fixup: %s\n", dev->name,

		pr_warn("%s: board type fixup: %s\n", dev->name,

		saa7134_boards[dev->board].name);

		saa7134_boards[dev->board].name);

		dev->tuner_type = saa7134_boards[dev->board].tuner_type;

		dev->tuner_type = saa7134_boards[dev->board].tuner_type;

drivers/media/pci/saa7134/saa7134-core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -947,7 +947,7 @@ static int saa7134_initdev(struct pci_dev *pci_dev, 
	       dev->pci_lat,(unsigned long long)pci_resource_start(pci_dev,0));

	       dev->pci_lat,(unsigned long long)pci_resource_start(pci_dev,0));

	pci_set_master(pci_dev);

	pci_set_master(pci_dev);

	if (!pci_dma_supported(pci_dev, DMA_BIT_MASK(32))) {

	if (!pci_dma_supported(pci_dev, DMA_BIT_MASK(32))) {

		printk("%s: Oops: no 32bit PCI DMA ???\n",dev->name);

		pr_warn("%s: Oops: no 32bit PCI DMA ???\n", dev->name);

		err = -EIO;

		err = -EIO;

		goto fail1;

		goto fail1;

	}

	}