Commit 2665c299 authored by Frank Schaefer's avatar Frank Schaefer Committed by Mauro Carvalho Chehab
Browse files

[media] em28xx: simplify device state tracking 



DEV_INITIALIZED of enum em28xx_dev_state state is used nowhere and there is no
need for DEV_MISCONFIGURED, so remove this enum and use a boolean field
'disconnected' in the device struct instead.

Signed-off-by: default avatarFrank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d3829fad

drivers/media/usb/em28xx/em28xx-cards.c

+2 −3
Original line number Diff line number Diff line
@@ -3530,11 +3530,10 @@ static void em28xx_usb_disconnect(struct usb_interface *interface) 
		     "deallocation are deferred on close.\n",

		     video_device_node_name(dev->vdev));



		dev->state |= DEV_MISCONFIGURED;

		em28xx_uninit_usb_xfer(dev, dev->mode);

		dev->state |= DEV_DISCONNECTED;

		dev->disconnected = 1;

	} else {

		dev->state |= DEV_DISCONNECTED;

		dev->disconnected = 1;

		em28xx_release_resources(dev);

	}

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

+2 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ int em28xx_read_reg_req_len(struct em28xx *dev, u8 req, u16 reg, 
	int ret;

	int pipe = usb_rcvctrlpipe(dev->udev, 0);



	if (dev->state & DEV_DISCONNECTED)

	if (dev->disconnected)

		return -ENODEV;



	if (len > URB_MAX_CTRL_SIZE)
@@ -153,7 +153,7 @@ int em28xx_write_regs_req(struct em28xx *dev, u8 req, u16 reg, char *buf, 
	int ret;

	int pipe = usb_sndctrlpipe(dev->udev, 0);



	if (dev->state & DEV_DISCONNECTED)

	if (dev->disconnected)

		return -ENODEV;



	if ((len < 1) || (len > URB_MAX_CTRL_SIZE))

drivers/media/usb/em28xx/em28xx-dvb.c

+2 −2
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static inline int em28xx_dvb_urb_data_copy(struct em28xx *dev, struct urb *urb) 
	if (!dev)

		return 0;



	if ((dev->state & DEV_DISCONNECTED) || (dev->state & DEV_MISCONFIGURED))

	if (dev->disconnected)

		return 0;



	if (urb->status < 0)
@@ -1322,7 +1322,7 @@ static int em28xx_dvb_fini(struct em28xx *dev) 
	if (dev->dvb) {

		struct em28xx_dvb *dvb = dev->dvb;



		if (dev->state & DEV_DISCONNECTED) {

		if (dev->disconnected) {

			/* We cannot tell the device to sleep

			 * once it has been unplugged. */

			if (dvb->fe[0])

drivers/media/usb/em28xx/em28xx-video.c

+3 −9
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ static inline int em28xx_urb_data_copy(struct em28xx *dev, struct urb *urb) 
	if (!dev)

		return 0;



	if ((dev->state & DEV_DISCONNECTED) || (dev->state & DEV_MISCONFIGURED))

	if (dev->disconnected)

		return 0;



	if (urb->status < 0)
@@ -801,16 +801,10 @@ const struct v4l2_ctrl_ops em28xx_ctrl_ops = { 


static int check_dev(struct em28xx *dev)

{

	if (dev->state & DEV_DISCONNECTED) {

	if (dev->disconnected) {

		em28xx_errdev("v4l2 ioctl: device not present\n");

		return -ENODEV;

	}



	if (dev->state & DEV_MISCONFIGURED) {

		em28xx_errdev("v4l2 ioctl: device is misconfigured; "

			      "close and open it again\n");

		return -EIO;

	}

	return 0;

}
@@ -1708,7 +1702,7 @@ static int em28xx_v4l2_close(struct file *filp) 
	if (dev->users == 1) {

		/* the device is already disconnect,

		   free the remaining resources */

		if (dev->state & DEV_DISCONNECTED) {

		if (dev->disconnected) {

			em28xx_release_resources(dev);

			kfree(dev->alt_max_pkt_size_isoc);

			mutex_unlock(&dev->lock);

drivers/media/usb/em28xx/em28xx.h

+2 −10
Original line number Diff line number Diff line
@@ -439,13 +439,6 @@ struct em28xx_eeprom { 
	u8 string_idx_table;

};



/* device states */

enum em28xx_dev_state {

	DEV_INITIALIZED = 0x01,

	DEV_DISCONNECTED = 0x02,

	DEV_MISCONFIGURED = 0x04,

};



#define EM28XX_AUDIO_BUFS 5

#define EM28XX_NUM_AUDIO_PACKETS 64

#define EM28XX_AUDIO_MAX_PACKET_SIZE 196 /* static value */
@@ -492,6 +485,8 @@ struct em28xx { 
	int devno;		/* marks the number of this device */

	enum em28xx_chip_id chip_id;



	unsigned char disconnected:1;	/* device has been diconnected */



	int audio_ifnum;



	struct v4l2_device v4l2_dev;
@@ -563,9 +558,6 @@ struct em28xx { 


	struct em28xx_audio adev;



	/* states */

	enum em28xx_dev_state state;



	/* capture state tracking */

	int capture_type;

	unsigned char top_field:1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE