diff options
author | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2013-12-22 11:13:41 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-01-05 05:58:49 -0500 |
commit | ce67943e2dfd3bc8b7e86b428fc0dfc568730971 (patch) | |
tree | 0f891cee6f6ba41be2ed9104fae59ddbce60eba1 | |
parent | 0560f337f3282dc6bf77b13ac344ffe30d9ccce5 (diff) |
[media] em28xx: some cosmetic changes
In order to make easier for the next patches, do some
cosmetic changes.
No functional changes.
Reviewed-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r-- | drivers/media/usb/em28xx/em28xx-cards.c | 2 | ||||
-rw-r--r-- | drivers/media/usb/em28xx/em28xx-video.c | 2 | ||||
-rw-r--r-- | 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[] = { | |||
2106 | }, | 2106 | }, |
2107 | /* 1b80:e1cc Delock 61959 | 2107 | /* 1b80:e1cc Delock 61959 |
2108 | * Empia EM2874B + Micronas DRX 3913KA2 + NXP TDA18271HDC2 | 2108 | * Empia EM2874B + Micronas DRX 3913KA2 + NXP TDA18271HDC2 |
2109 | * mostly the same as MaxMedia UB-425-TC but different remote */ | 2109 | * mostly the same as MaxMedia UB-425-TC but different remote */ |
2110 | [EM2874_BOARD_DELOCK_61959] = { | 2110 | [EM2874_BOARD_DELOCK_61959] = { |
2111 | .name = "Delock 61959", | 2111 | .name = "Delock 61959", |
2112 | .tuner_type = TUNER_ABSENT, | 2112 | .tuner_type = TUNER_ABSENT, |
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c index 51d440588ed5..b3ede856c32e 100644 --- a/drivers/media/usb/em28xx/em28xx-video.c +++ b/drivers/media/usb/em28xx/em28xx-video.c | |||
@@ -51,8 +51,6 @@ | |||
51 | 51 | ||
52 | #define DRIVER_DESC "Empia em28xx based USB video device driver" | 52 | #define DRIVER_DESC "Empia em28xx based USB video device driver" |
53 | 53 | ||
54 | #define EM28XX_VERSION "0.2.0" | ||
55 | |||
56 | static unsigned int isoc_debug; | 54 | static unsigned int isoc_debug; |
57 | module_param(isoc_debug, int, 0644); | 55 | module_param(isoc_debug, int, 0644); |
58 | MODULE_PARM_DESC(isoc_debug, "enable debug messages [isoc transfers]"); | 56 | 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 @@ | |||
26 | #ifndef _EM28XX_H | 26 | #ifndef _EM28XX_H |
27 | #define _EM28XX_H | 27 | #define _EM28XX_H |
28 | 28 | ||
29 | #define EM28XX_VERSION "0.2.0" | ||
30 | |||
29 | #include <linux/workqueue.h> | 31 | #include <linux/workqueue.h> |
30 | #include <linux/i2c.h> | 32 | #include <linux/i2c.h> |
31 | #include <linux/mutex.h> | 33 | #include <linux/mutex.h> |
@@ -522,9 +524,12 @@ struct em28xx { | |||
522 | int model; /* index in the device_data struct */ | 524 | int model; /* index in the device_data struct */ |
523 | int devno; /* marks the number of this device */ | 525 | int devno; /* marks the number of this device */ |
524 | enum em28xx_chip_id chip_id; | 526 | enum em28xx_chip_id chip_id; |
525 | unsigned int is_em25xx:1; /* em25xx/em276x/7x/8x family bridge */ | ||
526 | 527 | ||
528 | unsigned int is_em25xx:1; /* em25xx/em276x/7x/8x family bridge */ | ||
527 | unsigned char disconnected:1; /* device has been diconnected */ | 529 | unsigned char disconnected:1; /* device has been diconnected */ |
530 | unsigned int has_audio_class:1; | ||
531 | unsigned int has_alsa_audio:1; | ||
532 | unsigned int is_audio_only:1; | ||
528 | 533 | ||
529 | int audio_ifnum; | 534 | int audio_ifnum; |
530 | 535 | ||
@@ -544,10 +549,6 @@ struct em28xx { | |||
544 | /* Vinmode/Vinctl used at the driver */ | 549 | /* Vinmode/Vinctl used at the driver */ |
545 | int vinmode, vinctl; | 550 | int vinmode, vinctl; |
546 | 551 | ||
547 | unsigned int has_audio_class:1; | ||
548 | unsigned int has_alsa_audio:1; | ||
549 | unsigned int is_audio_only:1; | ||
550 | |||
551 | /* Controls audio streaming */ | 552 | /* Controls audio streaming */ |
552 | struct work_struct wq_trigger; /* Trigger to start/stop audio for alsa module */ | 553 | struct work_struct wq_trigger; /* Trigger to start/stop audio for alsa module */ |
553 | atomic_t stream_started; /* stream should be running if true */ | 554 | atomic_t stream_started; /* stream should be running if true */ |