Commit 6743033e authored by Frank Schaefer's avatar Frank Schaefer Committed by Mauro Carvalho Chehab
Browse files

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



Just a cleanup. No functional changes.

Signed-off-by: default avatarFrank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent aa4ce5f7
Loading
Loading
Loading
Loading
+5 −6
Original line number Diff line number Diff line
@@ -542,6 +542,11 @@ struct em28xx_i2c_bus {
struct em28xx {
	struct kref ref;

	/* Sub-module data */
	struct em28xx_dvb *dvb;
	struct em28xx_audio adev;
	struct em28xx_IR *ir;

	/* generic device properties */
	char name[30];		/* name (including minor) of the device */
	int model;		/* index in the device_data struct */
@@ -577,8 +582,6 @@ struct em28xx {

	struct em28xx_fmt *format;

	struct em28xx_IR *ir;

	/* Some older em28xx chips needs a waiting time after writing */
	unsigned int wait_after_write;

@@ -624,8 +627,6 @@ struct em28xx {
	unsigned long i2c_hash;	/* i2c devicelist hash -
				   for boards with generic ID */

	struct em28xx_audio adev;

	/* capture state tracking */
	int capture_type;
	unsigned char top_field:1;
@@ -705,8 +706,6 @@ struct em28xx {
	/* Snapshot button input device */
	char snapshot_button_path[30];	/* path of the input dev */
	struct input_dev *sbutton_input_dev;

	struct em28xx_dvb *dvb;
};

#define kref_to_dev(d) container_of(d, struct em28xx, ref)