Commit 9785a61b authored by Wolfram Sang's avatar Wolfram Sang Committed by Mauro Carvalho Chehab
Browse files

media: usb: dvb-usb-v2: rtl28xxu: convert to use i2c_new_client_device() 



Use the newer API returning an ERRPTR and use the new helper to bail
out.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 402e77c4

drivers/media/usb/dvb-usb-v2/rtl28xxu.c

+21 −19
Original line number Diff line number Diff line
@@ -697,8 +697,8 @@ static int rtl2831u_frontend_attach(struct dvb_usb_adapter *adap) 
	board_info.addr = 0x10;

	board_info.platform_data = pdata;

	request_module("%s", board_info.type);

	client = i2c_new_device(&d->i2c_adap, &board_info);

	if (client == NULL || client->dev.driver == NULL) {

	client = i2c_new_client_device(&d->i2c_adap, &board_info);

	if (!i2c_client_has_driver(client)) {

		ret = -ENODEV;

		goto err;

	}
@@ -918,8 +918,8 @@ static int rtl2832u_frontend_attach(struct dvb_usb_adapter *adap) 
	board_info.addr = 0x10;

	board_info.platform_data = pdata;

	request_module("%s", board_info.type);

	client = i2c_new_device(&d->i2c_adap, &board_info);

	if (client == NULL || client->dev.driver == NULL) {

	client = i2c_new_client_device(&d->i2c_adap, &board_info);

	if (!i2c_client_has_driver(client)) {

		ret = -ENODEV;

		goto err;

	}
@@ -960,8 +960,8 @@ static int rtl2832u_frontend_attach(struct dvb_usb_adapter *adap) 
			info.addr = 0x18;

			info.platform_data = &mn88472_config;

			request_module(info.type);

			client = i2c_new_device(&d->i2c_adap, &info);

			if (client == NULL || client->dev.driver == NULL) {

			client = i2c_new_client_device(&d->i2c_adap, &info);

			if (!i2c_client_has_driver(client)) {

				dev->slave_demod = SLAVE_DEMOD_NONE;

				goto err_slave_demod_failed;

			}
@@ -982,8 +982,8 @@ static int rtl2832u_frontend_attach(struct dvb_usb_adapter *adap) 
			info.addr = 0x18;

			info.platform_data = &mn88473_config;

			request_module(info.type);

			client = i2c_new_device(&d->i2c_adap, &info);

			if (client == NULL || client->dev.driver == NULL) {

			client = i2c_new_client_device(&d->i2c_adap, &info);

			if (!i2c_client_has_driver(client)) {

				dev->slave_demod = SLAVE_DEMOD_NONE;

				goto err_slave_demod_failed;

			}
@@ -1025,8 +1025,8 @@ static int rtl2832u_frontend_attach(struct dvb_usb_adapter *adap) 
			info.addr = 0x64;

			info.platform_data = &si2168_config;

			request_module(info.type);

			client = i2c_new_device(&d->i2c_adap, &info);

			if (client == NULL || client->dev.driver == NULL) {

			client = i2c_new_client_device(&d->i2c_adap, &info);

			if (!i2c_client_has_driver(client)) {

				dev->slave_demod = SLAVE_DEMOD_NONE;

				goto err_slave_demod_failed;

			}
@@ -1217,8 +1217,9 @@ static int rtl2832u_tuner_attach(struct dvb_usb_adapter *adap) 
			info.platform_data = &e4000_config;



			request_module(info.type);

			client = i2c_new_device(dev->demod_i2c_adapter, &info);

			if (client == NULL || client->dev.driver == NULL)

			client = i2c_new_client_device(dev->demod_i2c_adapter,

						       &info);

			if (!i2c_client_has_driver(client))

				break;



			if (!try_module_get(client->dev.driver->owner)) {
@@ -1240,9 +1241,9 @@ static int rtl2832u_tuner_attach(struct dvb_usb_adapter *adap) 
			board_info.addr = 0x56;

			board_info.platform_data = &fc2580_pdata;

			request_module("fc2580");

			client = i2c_new_device(dev->demod_i2c_adapter,

			client = i2c_new_client_device(dev->demod_i2c_adapter,

						       &board_info);

			if (client == NULL || client->dev.driver == NULL)

			if (!i2c_client_has_driver(client))

				break;

			if (!try_module_get(client->dev.driver->owner)) {

				i2c_unregister_device(client);
@@ -1271,8 +1272,9 @@ static int rtl2832u_tuner_attach(struct dvb_usb_adapter *adap) 
		board_info.addr = 0x60;

		board_info.platform_data = &tua9001_pdata;

		request_module("tua9001");

		client = i2c_new_device(dev->demod_i2c_adapter, &board_info);

		if (client == NULL || client->dev.driver == NULL)

		client = i2c_new_client_device(dev->demod_i2c_adapter,

					       &board_info);

		if (!i2c_client_has_driver(client))

			break;

		if (!try_module_get(client->dev.driver->owner)) {

			i2c_unregister_device(client);
@@ -1316,8 +1318,8 @@ static int rtl2832u_tuner_attach(struct dvb_usb_adapter *adap) 
			info.addr = 0x60;

			info.platform_data = &si2157_config;

			request_module(info.type);

			client = i2c_new_device(&d->i2c_adap, &info);

			if (client == NULL || client->dev.driver == NULL)

			client = i2c_new_client_device(&d->i2c_adap, &info);

			if (!i2c_client_has_driver(client))

				break;



			if (!try_module_get(client->dev.driver->owner)) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE