Commit 54607f29 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

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

Despite being big, the changes here are trivial: they just change the
probing method for I2C. So, apply it as a merge.

Tag branch

* tag 'br-v6.2g' of git://linuxtv.org/hverkuil/media_tree

: (96 commits)
  media: v4l2-core/tuner-core: Convert to i2c's .probe_new()
  media: usb: go7007: s2250-board: Convert to i2c's .probe_new()
  media: tuners/tua9001: Convert to i2c's .probe_new()
  media: tuners/tda18250: Convert to i2c's .probe_new()
  media: tuners/tda18212: Convert to i2c's .probe_new()
  media: tuners/qm1d1c0042: Convert to i2c's .probe_new()
  media: tuners/qm1d1b0004: Convert to i2c's .probe_new()
  media: tuners/mxl301rf: Convert to i2c's .probe_new()
  media: tuners/mt2060: Convert to i2c's .probe_new()
  media: tuners/m88rs6000t: Convert to i2c's .probe_new()
  media: tuners/fc2580: Convert to i2c's .probe_new()
  media: tuners/e4000: Convert to i2c's .probe_new()
  media: vidtv: Convert to i2c's .probe_new()
  media: radio/tef6862: Convert to i2c's .probe_new()
  media: radio/saa7706h: Convert to i2c's .probe_new()
  media: radio/radio-tea5764: Convert to i2c's .probe_new()
  media: i2c/wm8775: Convert to i2c's .probe_new()
  media: i2c/wm8739: Convert to i2c's .probe_new()
  media: i2c/vs6624: Convert to i2c's .probe_new()
  media: i2c/vpx3220: Convert to i2c's .probe_new()
  ...

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parents 55927c98 76ad5c0a

drivers/media/dvb-frontends/a8293.c

+2 −3
Original line number Diff line number Diff line
@@ -62,8 +62,7 @@ static int a8293_set_voltage(struct dvb_frontend *fe, 
	return ret;

}



static int a8293_probe(struct i2c_client *client,

		       const struct i2c_device_id *id)

static int a8293_probe(struct i2c_client *client)

{

	struct a8293_dev *dev;

	struct a8293_platform_data *pdata = client->dev.platform_data;
@@ -118,7 +117,7 @@ static struct i2c_driver a8293_driver = { 
		.name	= "a8293",

		.suppress_bind_attrs = true,

	},

	.probe		= a8293_probe,

	.probe_new	= a8293_probe,

	.remove		= a8293_remove,

	.id_table	= a8293_id_table,

};

drivers/media/dvb-frontends/af9013.c

+2 −3
Original line number Diff line number Diff line
@@ -1430,8 +1430,7 @@ static int af9013_regmap_read(void *context, const void *reg_buf, 
	return ret;

}



static int af9013_probe(struct i2c_client *client,

			const struct i2c_device_id *id)

static int af9013_probe(struct i2c_client *client)

{

	struct af9013_state *state;

	struct af9013_platform_data *pdata = client->dev.platform_data;
@@ -1564,7 +1563,7 @@ static struct i2c_driver af9013_driver = { 
		.name	= "af9013",

		.suppress_bind_attrs = true,

	},

	.probe		= af9013_probe,

	.probe_new	= af9013_probe,

	.remove		= af9013_remove,

	.id_table	= af9013_id_table,

};

drivers/media/dvb-frontends/af9033.c

+2 −3
Original line number Diff line number Diff line
@@ -1049,8 +1049,7 @@ static const struct dvb_frontend_ops af9033_ops = { 
	.i2c_gate_ctrl = af9033_i2c_gate_ctrl,

};



static int af9033_probe(struct i2c_client *client,

			const struct i2c_device_id *id)

static int af9033_probe(struct i2c_client *client)

{

	struct af9033_config *cfg = client->dev.platform_data;

	struct af9033_dev *dev;
@@ -1184,7 +1183,7 @@ static struct i2c_driver af9033_driver = { 
		.name	= "af9033",

		.suppress_bind_attrs	= true,

	},

	.probe		= af9033_probe,

	.probe_new	= af9033_probe,

	.remove		= af9033_remove,

	.id_table	= af9033_id_table,

};

drivers/media/dvb-frontends/au8522_decoder.c

+2 −3
Original line number Diff line number Diff line
@@ -669,8 +669,7 @@ static const struct v4l2_ctrl_ops au8522_ctrl_ops = { 


/* ----------------------------------------------------------------------- */



static int au8522_probe(struct i2c_client *client,

			const struct i2c_device_id *did)

static int au8522_probe(struct i2c_client *client)

{

	struct au8522_state *state;

	struct v4l2_ctrl_handler *hdl;
@@ -777,7 +776,7 @@ static struct i2c_driver au8522_driver = { 
	.driver = {

		.name	= "au8522",

	},

	.probe		= au8522_probe,

	.probe_new	= au8522_probe,

	.remove		= au8522_remove,

	.id_table	= au8522_id,

};

drivers/media/dvb-frontends/cxd2099.c

+2 −3
Original line number Diff line number Diff line
@@ -598,8 +598,7 @@ static const struct dvb_ca_en50221 en_templ = { 
	.write_data          = write_data,

};



static int cxd2099_probe(struct i2c_client *client,

			 const struct i2c_device_id *id)

static int cxd2099_probe(struct i2c_client *client)

{

	struct cxd *ci;

	struct cxd2099_cfg *cfg = client->dev.platform_data;
@@ -682,7 +681,7 @@ static struct i2c_driver cxd2099_driver = { 
	.driver = {

		.name	= "cxd2099",

	},

	.probe		= cxd2099_probe,

	.probe_new	= cxd2099_probe,

	.remove		= cxd2099_remove,

	.id_table	= cxd2099_id,

};