Commit 8b77d1f9 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Mauro Carvalho Chehab
Browse files

media: cx231xx: Consolidate dmesg output 



The memory allocations in cx231xx_init_*() happen all in task context with
GFP_KERNEL. Therefore a dev_err() trying to deduce whether this is called
from task or interrupt context is pretty useless.

Remove these historical leftovers.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 994388f2

drivers/media/usb/cx231xx/cx231xx-core.c

+4 −6
Original line number Diff line number Diff line
@@ -1061,9 +1061,8 @@ int cx231xx_init_isoc(struct cx231xx *dev, int max_packets, 
				       &urb->transfer_dma);

		if (!dev->video_mode.isoc_ctl.transfer_buffer[i]) {

			dev_err(dev->dev,

				"unable to allocate %i bytes for transfer buffer %i%s\n",

				sb_size, i,

				in_interrupt() ? " while in int" : "");

				"unable to allocate %i bytes for transfer buffer %i\n",

				sb_size, i);

			cx231xx_uninit_isoc(dev);

			return -ENOMEM;

		}
@@ -1197,9 +1196,8 @@ int cx231xx_init_bulk(struct cx231xx *dev, int max_packets, 
				     &urb->transfer_dma);

		if (!dev->video_mode.bulk_ctl.transfer_buffer[i]) {

			dev_err(dev->dev,

				"unable to allocate %i bytes for transfer buffer %i%s\n",

				sb_size, i,

				in_interrupt() ? " while in int" : "");

				"unable to allocate %i bytes for transfer buffer %i\n",

				sb_size, i);

			cx231xx_uninit_bulk(dev);

			return -ENOMEM;

		}

drivers/media/usb/cx231xx/cx231xx-vbi.c

+2 −3
Original line number Diff line number Diff line
@@ -408,9 +408,8 @@ int cx231xx_init_vbi_isoc(struct cx231xx *dev, int max_packets, 
		    kzalloc(sb_size, GFP_KERNEL);

		if (!dev->vbi_mode.bulk_ctl.transfer_buffer[i]) {

			dev_err(dev->dev,

				"unable to allocate %i bytes for transfer buffer %i%s\n",

				sb_size, i,

				in_interrupt() ? " while in int" : "");

				"unable to allocate %i bytes for transfer buffer %i\n",

				sb_size, i);

			cx231xx_uninit_vbi_isoc(dev);

			return -ENOMEM;

		}