~hc/RK356X_SDK_RELEASE.git

..	..	@@ -470,7 +470,7 @@
470	470	reg->val = adv7511_cec_read(sd, reg->reg & 0xff);
471	471	break;
472	472	}
473		- /* fall through */
	473	+ fallthrough;
474	474	default:
475	475	v4l2_info(sd, "Register %03llx not supported\n", reg->reg);
476	476	adv7511_inv_register(sd);
..	..	@@ -492,7 +492,7 @@
492	492	adv7511_cec_write(sd, reg->reg & 0xff, reg->val & 0xff);
493	493	break;
494	494	}
495		- /* fall through */
	495	+ fallthrough;
496	496	default:
497	497	v4l2_info(sd, "Register %03llx not supported\n", reg->reg);
498	498	adv7511_inv_register(sd);
..	..	@@ -555,7 +555,7 @@
555	555	buffer[3] = 0;
556	556	buffer[3] = hdmi_infoframe_checksum(buffer, len + 4);
557	557
558		- if (hdmi_infoframe_unpack(&frame, buffer, sizeof(buffer)) < 0) {
	558	+ if (hdmi_infoframe_unpack(&frame, buffer, len + 4) < 0) {
559	559	v4l2_err(sd, "%s: unpack of %s infoframe failed\n", __func__, cri->desc);
560	560	return;
561	561	}
..	..	@@ -1872,11 +1872,11 @@
1872	1872	goto err_entity;
1873	1873	}
1874	1874
1875		- state->i2c_edid = i2c_new_dummy(client->adapter,
	1875	+ state->i2c_edid = i2c_new_dummy_device(client->adapter,
1876	1876	state->i2c_edid_addr >> 1);
1877		- if (state->i2c_edid == NULL) {
	1877	+ if (IS_ERR(state->i2c_edid)) {
1878	1878	v4l2_err(sd, "failed to register edid i2c client\n");
1879		- err = -ENOMEM;
	1879	+ err = PTR_ERR(state->i2c_edid);
1880	1880	goto err_entity;
1881	1881	}
1882	1882
..	..	@@ -1889,11 +1889,11 @@
1889	1889	}
1890	1890
1891	1891	if (state->pdata.cec_clk) {
1892		- state->i2c_cec = i2c_new_dummy(client->adapter,
	1892	+ state->i2c_cec = i2c_new_dummy_device(client->adapter,
1893	1893	state->i2c_cec_addr >> 1);
1894		- if (state->i2c_cec == NULL) {
	1894	+ if (IS_ERR(state->i2c_cec)) {
1895	1895	v4l2_err(sd, "failed to register cec i2c client\n");
1896		- err = -ENOMEM;
	1896	+ err = PTR_ERR(state->i2c_cec);
1897	1897	goto err_unreg_edid;
1898	1898	}
1899	1899	adv7511_wr(sd, 0xe2, 0x00); /* power up cec section */
..	..	@@ -1901,10 +1901,10 @@
1901	1901	adv7511_wr(sd, 0xe2, 0x01); /* power down cec section */
1902	1902	}
1903	1903
1904		- state->i2c_pktmem = i2c_new_dummy(client->adapter, state->i2c_pktmem_addr >> 1);
1905		- if (state->i2c_pktmem == NULL) {
	1904	+ state->i2c_pktmem = i2c_new_dummy_device(client->adapter, state->i2c_pktmem_addr >> 1);
	1905	+ if (IS_ERR(state->i2c_pktmem)) {
1906	1906	v4l2_err(sd, "failed to register pktmem i2c client\n");
1907		- err = -ENOMEM;
	1907	+ err = PTR_ERR(state->i2c_pktmem);
1908	1908	goto err_unreg_cec;
1909	1909	}
1910	1910
..	..	@@ -1940,8 +1940,7 @@
1940	1940	err_unreg_pktmem:
1941	1941	i2c_unregister_device(state->i2c_pktmem);
1942	1942	err_unreg_cec:
1943		- if (state->i2c_cec)
1944		- i2c_unregister_device(state->i2c_cec);
	1943	+ i2c_unregister_device(state->i2c_cec);
1945	1944	err_unreg_edid:
1946	1945	i2c_unregister_device(state->i2c_edid);
1947	1946	err_entity:
..	..	@@ -1967,8 +1966,7 @@
1967	1966	adv7511_init_setup(sd);
1968	1967	cancel_delayed_work_sync(&state->edid_handler);
1969	1968	i2c_unregister_device(state->i2c_edid);
1970		- if (state->i2c_cec)
1971		- i2c_unregister_device(state->i2c_cec);
	1969	+ i2c_unregister_device(state->i2c_cec);
1972	1970	i2c_unregister_device(state->i2c_pktmem);
1973	1971	destroy_workqueue(state->work_queue);
1974	1972	v4l2_device_unregister_subdev(sd);
..	..	@@ -1980,14 +1978,14 @@
1980	1978	/* ----------------------------------------------------------------------- */
1981	1979
1982	1980	static const struct i2c_device_id adv7511_id[] = {
1983		- { "adv7511", 0 },
	1981	+ { "adv7511-v4l2", 0 },
1984	1982	{ }
1985	1983	};
1986	1984	MODULE_DEVICE_TABLE(i2c, adv7511_id);
1987	1985
1988	1986	static struct i2c_driver adv7511_driver = {
1989	1987	.driver = {
1990		- .name = "adv7511",
	1988	+ .name = "adv7511-v4l2",
1991	1989	},
1992	1990	.probe = adv7511_probe,
1993	1991	.remove = adv7511_remove,