Skip to content

Commit

Permalink
[media] dvb_usb_v2: move I2C adapter code to different file
Browse files Browse the repository at this point in the history
No worth to keep it on own file as it is only 30 LOC.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Antti Palosaari authored and Mauro Carvalho Chehab committed Aug 4, 2012
1 parent 23d8e63 commit a177c72
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 39 deletions.
39 changes: 0 additions & 39 deletions drivers/media/dvb/dvb-usb/dvb_usb_i2c.c

This file was deleted.

31 changes: 31 additions & 0 deletions drivers/media/dvb/dvb-usb/dvb_usb_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit a177c72

Please sign in to comment.