UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] em28xx: move sub-module data structs to a common place in the main struct 

Just a cleanup. No functional changes.

Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Frank Schaefer 2014-03-24 16:33:07 -03:00 committed by Mauro Carvalho Chehab
parent aa4ce5f7f3
commit 6743033e58
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/media/usb/em28xx/em28xx.h
View File

@ -542,6 +542,11 @@ struct em28xx_i2c_bus {
struct em28xx { struct em28xx {
struct kref ref; struct kref ref;
/* Sub-module data */
struct em28xx_dvb *dvb;
struct em28xx_audio adev;
struct em28xx_IR *ir;
/* generic device properties */ /* generic device properties */
char name[30]; /* name (including minor) of the device */ char name[30]; /* name (including minor) of the device */
int model; /* index in the device_data struct */ int model; /* index in the device_data struct */
@ -577,8 +582,6 @@ struct em28xx {
struct em28xx_fmt *format; struct em28xx_fmt *format;
struct em28xx_IR *ir;
/* Some older em28xx chips needs a waiting time after writing */ /* Some older em28xx chips needs a waiting time after writing */
unsigned int wait_after_write; unsigned int wait_after_write;
@ -624,8 +627,6 @@ struct em28xx {
unsigned long i2c_hash; /* i2c devicelist hash - unsigned long i2c_hash; /* i2c devicelist hash -
for boards with generic ID */ for boards with generic ID */
struct em28xx_audio adev;
/* capture state tracking */ /* capture state tracking */
int capture_type; int capture_type;
unsigned char top_field:1; unsigned char top_field:1;
@ -705,8 +706,6 @@ struct em28xx {
/* Snapshot button input device */ /* Snapshot button input device */
char snapshot_button_path[30]; /* path of the input dev */ char snapshot_button_path[30]; /* path of the input dev */
struct input_dev *sbutton_input_dev; struct input_dev *sbutton_input_dev;
struct em28xx_dvb *dvb;
}; };
#define kref_to_dev(d) container_of(d, struct em28xx, ref) #define kref_to_dev(d) container_of(d, struct em28xx, ref)