From fee98366336b5bccacd17128a3c41d018c0c92d7 Mon Sep 17 00:00:00 2001
From: Antti Palosaari <crope@iki.fi>
Date: Thu, 7 Jun 2012 15:40:25 -0300
Subject: [PATCH] --- yaml --- r: 330595 b: refs/heads/master c:
 a177c72bf57f70585f08231145b2431b4182b2b4 h: refs/heads/master i:   330593:
 d29d361811cb61e6ed9bb185a1e76d88e59a8845   330591:
 14b231f1234fe29cb8709d1b82641ac5289aad44 v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/media/dvb/dvb-usb/dvb_usb_i2c.c | 39 -------------------
 .../drivers/media/dvb/dvb-usb/dvb_usb_init.c  | 31 +++++++++++++++
 3 files changed, 32 insertions(+), 40 deletions(-)
 delete mode 100644 trunk/drivers/media/dvb/dvb-usb/dvb_usb_i2c.c

diff --git a/[refs] b/[refs]
index fb30e038b610..b1671ffa718e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23d8e63a903bf8b6d9bf99bdd0e45aa901a90fff
+refs/heads/master: a177c72bf57f70585f08231145b2431b4182b2b4
diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb_usb_i2c.c b/trunk/drivers/media/dvb/dvb-usb/dvb_usb_i2c.c
deleted file mode 100644
index 202e1d1acffb..000000000000
--- a/trunk/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/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c b/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c
index 9dcf4e525795..aa7caa5c4684 100644
--- a/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c
+++ b/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c
@@ -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;