Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76dd272b authored by Jean-Francois Moine's avatar Jean-Francois Moine Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (13453): gspca - all subdrivers: Remove the unused frame ptr from pkt_scan(). 



Signed-off-by: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d131c3c9

drivers/media/video/gspca/conex.c

+5 −7
Original line number Diff line number Diff line
@@ -888,8 +888,7 @@ static void sd_stop0(struct gspca_dev *gspca_dev) 
}



static void sd_pkt_scan(struct gspca_dev *gspca_dev,

			struct gspca_frame *frame,	/* target */

			__u8 *data,			/* isoc packet */

			u8 *data,			/* isoc packet */

			int len)			/* iso packet length */

{

	struct sd *sd = (struct sd *) gspca_dev;
@@ -897,16 +896,15 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, 
	if (data[0] == 0xff && data[1] == 0xd8) {



		/* start of frame */

		frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame,

					data, 0);

		gspca_frame_add(gspca_dev, LAST_PACKET, NULL, 0);



		/* put the JPEG header in the new frame */

		gspca_frame_add(gspca_dev, FIRST_PACKET, frame,

		gspca_frame_add(gspca_dev, FIRST_PACKET,

				sd->jpeg_hdr, JPEG_HDR_SZ);

		data += 2;

		len -= 2;

	}

	gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len);

	gspca_frame_add(gspca_dev, INTER_PACKET, data, len);

}



static void setbrightness(struct gspca_dev*gspca_dev)

drivers/media/video/gspca/etoms.c

+4 −6
Original line number Diff line number Diff line
@@ -752,8 +752,7 @@ static void do_autogain(struct gspca_dev *gspca_dev) 
#undef LIMIT



static void sd_pkt_scan(struct gspca_dev *gspca_dev,

			struct gspca_frame *frame,	/* target */

			__u8 *data,			/* isoc packet */

			u8 *data,			/* isoc packet */

			int len)			/* iso packet length */

{

	int seqframe;
@@ -767,14 +766,13 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, 
		       data[2], data[3], data[4], data[5]);

		data += 30;

		/* don't change datalength as the chips provided it */

		frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame,

					data, 0);

		gspca_frame_add(gspca_dev, FIRST_PACKET, frame, data, len);

		gspca_frame_add(gspca_dev, LAST_PACKET, NULL, 0);

		gspca_frame_add(gspca_dev, FIRST_PACKET, data, len);

		return;

	}

	if (len) {

		data += 8;

		gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len);

		gspca_frame_add(gspca_dev, INTER_PACKET, data, len);

	} else {			/* Drop Packet */

		gspca_dev->last_packet_type = DISCARD_PACKET;

	}

drivers/media/video/gspca/finepix.c

+7 −16
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ static void dostream(struct work_struct *work) 
	struct gspca_dev *gspca_dev = &dev->gspca_dev;

	struct urb *urb = gspca_dev->urb[0];

	u8 *data = urb->transfer_buffer;

	struct gspca_frame *frame;

	int ret = 0;

	int len;
@@ -118,10 +117,6 @@ static void dostream(struct work_struct *work) 
			}

			if (!gspca_dev->present || !gspca_dev->streaming)

				goto out;

			frame = gspca_get_i_frame(&dev->gspca_dev);

			if (frame == NULL)

				gspca_dev->last_packet_type = DISCARD_PACKET;



			if (len < FPIX_MAX_TRANSFER ||

				(data[len - 2] == 0xff &&

					data[len - 1] == 0xd9)) {
@@ -132,21 +127,17 @@ static void dostream(struct work_struct *work) 
				 * but there's nothing we can do. We also end

				 * here if the the jpeg ends right at the end

				 * of the frame. */

				if (frame)

					frame = gspca_frame_add(gspca_dev,

							LAST_PACKET,

							frame,

				gspca_frame_add(gspca_dev, LAST_PACKET,

						data, len);

				break;

			}



			/* got a partial image */

			if (frame)

			gspca_frame_add(gspca_dev,

					gspca_dev->last_packet_type

						== LAST_PACKET

					? FIRST_PACKET : INTER_PACKET,

						frame, data, len);

					data, len);

		}



		/* We must wait before trying reading the next

drivers/media/video/gspca/gl860/gl860.c

+5 −5
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static int sd_isoc_init(struct gspca_dev *gspca_dev); 
static int  sd_start(struct gspca_dev *gspca_dev);

static void sd_stop0(struct gspca_dev *gspca_dev);

static void sd_pkt_scan(struct gspca_dev *gspca_dev,

			struct gspca_frame *frame, u8 *data, s32 len);

			u8 *data, int len);

static void sd_callback(struct gspca_dev *gspca_dev);



static int gl860_guess_sensor(struct gspca_dev *gspca_dev,
@@ -433,7 +433,7 @@ static void sd_stop0(struct gspca_dev *gspca_dev) 


/* This function is called when an image is being received */

static void sd_pkt_scan(struct gspca_dev *gspca_dev,

			struct gspca_frame *frame, u8 *data, s32 len)

			u8 *data, int len)

{

	struct sd *sd = (struct sd *) gspca_dev;

	static s32 nSkipped;
@@ -445,11 +445,11 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, 
	/* Test only against 0202h, so endianess does not matter */

	switch (*(s16 *) data) {

	case 0x0202:		/* End of frame, start a new one */

		frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame, data, 0);

		gspca_frame_add(gspca_dev, LAST_PACKET, NULL, 0);

		nSkipped = 0;

		if (sd->nbIm >= 0 && sd->nbIm < 10)

			sd->nbIm++;

		gspca_frame_add(gspca_dev, FIRST_PACKET, frame, data, 0);

		gspca_frame_add(gspca_dev, FIRST_PACKET, NULL, 0);

		break;



	default:
@@ -464,7 +464,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, 
				nSkipped = nToSkip + 1;

			}

			gspca_frame_add(gspca_dev,

				INTER_PACKET, frame, data, len);

				INTER_PACKET, data, len);

		}

		break;

	}

drivers/media/video/gspca/gspca.c

+9 −11
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static void fill_frame(struct gspca_dev *gspca_dev, 
			i, urb->iso_frame_desc[i].offset, len);

		data = (u8 *) urb->transfer_buffer

					+ urb->iso_frame_desc[i].offset;

		pkt_scan(gspca_dev, gspca_dev->cur_frame, data, len);

		pkt_scan(gspca_dev, data, len);

	}



resubmit:
@@ -218,7 +218,6 @@ static void bulk_irq(struct urb *urb) 


	PDEBUG(D_PACK, "packet l:%d", urb->actual_length);

	gspca_dev->sd_desc->pkt_scan(gspca_dev,

				gspca_dev->frame,

				urb->transfer_buffer,

				urb->actual_length);
@@ -243,10 +242,9 @@ static void bulk_irq(struct urb *urb) 
 * DISCARD_PACKET invalidates the whole frame.

 * On LAST_PACKET, a new frame is returned.

 */

struct gspca_frame *gspca_frame_add(struct gspca_dev *gspca_dev,

void gspca_frame_add(struct gspca_dev *gspca_dev,

			enum gspca_packet_type packet_type,

				    struct gspca_frame *dummy,

				    const __u8 *data,

			const u8 *data,

			int len)

{

	struct gspca_frame *frame;
@@ -259,7 +257,7 @@ struct gspca_frame *gspca_frame_add(struct gspca_dev *gspca_dev, 
	if ((frame->v4l2_buf.flags & BUF_ALL_FLAGS)

					!= V4L2_BUF_FLAG_QUEUED) {

		gspca_dev->last_packet_type = DISCARD_PACKET;

		return frame;

		return;

	}



	/* when start of a new frame, if the current frame buffer
@@ -272,7 +270,7 @@ struct gspca_frame *gspca_frame_add(struct gspca_dev *gspca_dev, 
	} else if (gspca_dev->last_packet_type == DISCARD_PACKET) {

		if (packet_type == LAST_PACKET)

			gspca_dev->last_packet_type = packet_type;

		return frame;

		return;

	}



	/* append the packet to the frame buffer */
@@ -304,9 +302,9 @@ struct gspca_frame *gspca_frame_add(struct gspca_dev *gspca_dev, 
			i,

			gspca_dev->fr_o);

		j = gspca_dev->fr_queue[i];

		gspca_dev->cur_frame = frame = &gspca_dev->frame[j];

		gspca_dev->cur_frame = &gspca_dev->frame[j];

	}

	return frame;

	return;

}

EXPORT_SYMBOL(gspca_frame_add);