Commit b9fbe29c authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Merge tag 'br-v6.2d' of git://linuxtv.org/hverkuil/media_tree into media_stage 

Tag branch

* tag 'br-v6.2d' of git://linuxtv.org/hverkuil/media_tree: (35 commits)
  media: saa7164: remove variable cnt
  atomisp: fix potential NULL pointer dereferences
  radio-terratec: Remove variable p
  media: platform: s5p-mfc: Fix spelling mistake "mmaping" -> "mmapping"
  media: platform: mtk-mdp3: remove unused VIDEO_MEDIATEK_VPU config
  media: vivid: remove redundant assignment to variable checksum
  media: cedrus: h264: Optimize mv col buffer allocation
  media: cedrus: h265: Associate mv col buffers with buffer
  media: mediatek: vcodec: fix h264 cavlc bitstream fail
  media: cedrus: hevc: Fix offset adjustments
  media: imx-jpeg: Fix Coverity issue in probe
  media: v4l2-ioctl.c: Unify YCbCr/YUV terms in format descriptions
  media: atomisp: Fix spelling mistake "mis-match" -> "mismatch"
  media: c8sectpfe: Add missed header(s)
  media: adv748x: afe: Select input port when initializing AFE
  media: vimc: Update device configuration in the documentation
  media: adv748x: Remove dead function declaration
  media: mxl5005s: Make array RegAddr static const
  media: atomisp: Fix spelling mistake "modee" -> "mode"
  media: meson/vdec: always init coef_node_start
  ...
parents a7bab6f8 16f32111

drivers/media/dvb-frontends/cxd2820r_priv.h

+0 −2
Original line number Diff line number Diff line
@@ -52,8 +52,6 @@ struct cxd2820r_priv { 


/* cxd2820r_core.c */



extern int cxd2820r_debug;



int cxd2820r_gpio(struct dvb_frontend *fe, u8 *gpio);



int cxd2820r_wr_reg_val_mask_tab(struct cxd2820r_priv *priv,

drivers/media/dvb-frontends/drx39xyj/drx_dap_fasi.h

+0 −2
Original line number Diff line number Diff line
@@ -234,8 +234,6 @@ 


/*-------- Public API functions ----------------------------------------------*/



extern struct drx_access_func drx_dap_fasi_funct_g;



#define DRXDAP_FASI_RMW           0x10000000

#define DRXDAP_FASI_BROADCAST     0x20000000

#define DRXDAP_FASI_CLEARCRC      0x80000000

drivers/media/i2c/adv748x/adv748x-afe.c

+4 −0
Original line number Diff line number Diff line
@@ -521,6 +521,10 @@ int adv748x_afe_init(struct adv748x_afe *afe) 
		}

	}



	adv748x_afe_s_input(afe, afe->input);



	adv_dbg(state, "AFE Default input set to %d\n", afe->input);



	/* Entity pads and sinks are 0-indexed to match the pads */

	for (i = ADV748X_AFE_SINK_AIN0; i <= ADV748X_AFE_SINK_AIN7; i++)

		afe->pads[i].flags = MEDIA_PAD_FL_SINK;

drivers/media/i2c/adv748x/adv748x.h

+0 −3
Original line number Diff line number Diff line
@@ -428,9 +428,6 @@ void adv748x_subdev_init(struct v4l2_subdev *sd, struct adv748x_state *state, 
			 const struct v4l2_subdev_ops *ops, u32 function,

			 const char *ident);



int adv748x_register_subdevs(struct adv748x_state *state,

			     struct v4l2_device *v4l2_dev);



int adv748x_tx_power(struct adv748x_csi2 *tx, bool on);



int adv748x_afe_init(struct adv748x_afe *afe);

drivers/media/pci/bt8xx/bttv.h

+0 −1
Original line number Diff line number Diff line
@@ -289,7 +289,6 @@ extern void bttv_init_card2(struct bttv *btv); 
extern void bttv_init_tuner(struct bttv *btv);



/* card-specific functions */

extern void tea5757_set_freq(struct bttv *btv, unsigned short freq);

extern u32 bttv_tda9880_setnorm(struct bttv *btv, u32 gpiobits);



/* extra tweaks for some chipsets */