[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: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/dvb-usb/dvb_usb_i2c.c b/drivers/media/dvb/dvb-usb/dvb_usb_i2c.c
deleted file mode 100644 (file)
index 202e1d1..0000000
--- a/drivers/media/dvb/dvb-usb/dvb_usb_i2c.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* 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;
-}

diff --git a/drivers/media/dvb/dvb-usb/dvb_usb_init.c b/drivers/media/dvb/dvb-usb/dvb_usb_init.c
index 9dcf4e5257952532c09cccb9c43f8eb14f6f0366..aa7caa5c4684e9d7b7594ed3c5c626390005e970 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dvb_usb_init.c
+++ b/drivers/media/dvb/dvb-usb/dvb_usb_init.c
@@ -68,6 +68,37 @@ err:
        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;