Am 04.01.2014 11:55, schrieb Mauro Carvalho Chehab:
> In order to make easier for the next patches, do some
> cosmetic changes.
>
> No functional changes.
>
> Signed-off-by: Mauro Carvalho Chehab <m.chehab@xxxxxxxxxxx>
> ---
> drivers/media/usb/em28xx/em28xx-cards.c | 2 +-
> drivers/media/usb/em28xx/em28xx-video.c | 2 --
> drivers/media/usb/em28xx/em28xx.h | 11 ++++++-----
> 3 files changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
> index 19827e79cf53..551cbc294190 100644
> --- a/drivers/media/usb/em28xx/em28xx-cards.c
> +++ b/drivers/media/usb/em28xx/em28xx-cards.c
> @@ -2106,7 +2106,7 @@ struct em28xx_board em28xx_boards[] = {
> },
> /* 1b80:e1cc Delock 61959
> * Empia EM2874B + Micronas DRX 3913KA2 + NXP TDA18271HDC2
> - * mostly the same as MaxMedia UB-425-TC but different remote */
> + * mostly the same as MaxMedia UB-425-TC but different remote */
> [EM2874_BOARD_DELOCK_61959] = {
> .name = "Delock 61959",
> .tuner_type = TUNER_ABSENT,
> diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
> index 70ffe259df5b..8b8a4eb96875 100644
> --- a/drivers/media/usb/em28xx/em28xx-video.c
> +++ b/drivers/media/usb/em28xx/em28xx-video.c
> @@ -51,8 +51,6 @@
>
> #define DRIVER_DESC "Empia em28xx based USB video device driver"
>
> -#define EM28XX_VERSION "0.2.0"
> -
> static unsigned int isoc_debug;
> module_param(isoc_debug, int, 0644);
> MODULE_PARM_DESC(isoc_debug, "enable debug messages [isoc transfers]");
> diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h
> index 0259270dda46..7ae05ebc13c1 100644
> --- a/drivers/media/usb/em28xx/em28xx.h
> +++ b/drivers/media/usb/em28xx/em28xx.h
> @@ -26,6 +26,8 @@
> #ifndef _EM28XX_H
> #define _EM28XX_H
>
> +#define EM28XX_VERSION "0.2.0"
> +
> #include <linux/workqueue.h>
> #include <linux/i2c.h>
> #include <linux/mutex.h>
> @@ -522,9 +524,12 @@ struct em28xx {
> int model; /* index in the device_data struct */
> int devno; /* marks the number of this device */
> enum em28xx_chip_id chip_id;
> - unsigned int is_em25xx:1; /* em25xx/em276x/7x/8x family bridge */
>
> + unsigned int is_em25xx:1; /* em25xx/em276x/7x/8x family bridge */
> unsigned char disconnected:1; /* device has been diconnected */
> + unsigned int has_audio_class:1;
> + unsigned int has_alsa_audio:1;
> + unsigned int is_audio_only:1;
>
> int audio_ifnum;
>
> @@ -544,10 +549,6 @@ struct em28xx {
> /* Vinmode/Vinctl used at the driver */
> int vinmode, vinctl;
>
> - unsigned int has_audio_class:1;
> - unsigned int has_alsa_audio:1;
> - unsigned int is_audio_only:1;
> -
> /* Controls audio streaming */
> struct work_struct wq_trigger; /* Trigger to start/stop audio for alsa module */
> atomic_t stream_started; /* stream should be running if true */
Reviewed-by: Frank Schäfer <fschaefer.oss@xxxxxxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
