Commit a177c72b authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab
Browse files

[media] dvb_usb_v2: move I2C adapter code to different file 



No worth to keep it on own file as it is only 30 LOC.

Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 23d8e63a

drivers/media/dvb/dvb-usb/dvb_usb_i2c.c

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
/* dvb-usb-i2c.c is part of the DVB USB library.

 *

 * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@desy.de)

 * see dvb-usb-init.c for copyright information.

 *

 * This file contains functions for (de-)initializing an I2C adapter.

 */

#include "dvb_usb_common.h"



int dvb_usb_i2c_init(struct dvb_usb_device *d)

{

	int ret = 0;



	if (!d->props.i2c_algo)

		return 0;



	strlcpy(d->i2c_adap.name, d->name, sizeof(d->i2c_adap.name));

	d->i2c_adap.algo      = d->props.i2c_algo;

	d->i2c_adap.algo_data = NULL;

	d->i2c_adap.dev.parent = &d->udev->dev;



	i2c_set_adapdata(&d->i2c_adap, d);



	ret = i2c_add_adapter(&d->i2c_adap);

	if (ret < 0)

		pr_err("%s: could not add i2c adapter", KBUILD_MODNAME);



	d->state |= DVB_USB_STATE_I2C;



	return ret;

}



int dvb_usb_i2c_exit(struct dvb_usb_device *d)

{

	if (d->state & DVB_USB_STATE_I2C)

		i2c_del_adapter(&d->i2c_adap);

	d->state &= ~DVB_USB_STATE_I2C;

	return 0;

}

drivers/media/dvb/dvb-usb/dvb_usb_init.c

+31 −0
Original line number Diff line number Diff line
@@ -68,6 +68,37 @@ int dvb_usb_download_firmware(struct dvb_usb_device *d) 
	return ret;

}



int dvb_usb_i2c_init(struct dvb_usb_device *d)

{

	int ret = 0;



	if (!d->props.i2c_algo)

		return 0;



	strlcpy(d->i2c_adap.name, d->name, sizeof(d->i2c_adap.name));

	d->i2c_adap.algo = d->props.i2c_algo;

	d->i2c_adap.algo_data = NULL;

	d->i2c_adap.dev.parent = &d->udev->dev;



	i2c_set_adapdata(&d->i2c_adap, d);



	ret = i2c_add_adapter(&d->i2c_adap);

	if (ret < 0)

		pr_err("%s: could not add i2c adapter", KBUILD_MODNAME);



	d->state |= DVB_USB_STATE_I2C;



	return ret;

}



int dvb_usb_i2c_exit(struct dvb_usb_device *d)

{

	if (d->state & DVB_USB_STATE_I2C)

		i2c_del_adapter(&d->i2c_adap);

	d->state &= ~DVB_USB_STATE_I2C;

	return 0;

}



static int dvb_usb_adapter_init(struct dvb_usb_device *d)

{

	struct dvb_usb_adapter *adap;