diff options
author | Antti Palosaari <crope@iki.fi> | 2012-06-07 14:40:25 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-08-04 06:56:27 -0400 |
commit | a177c72bf57f70585f08231145b2431b4182b2b4 (patch) | |
tree | 86150038c700f5614008d7d2c06592cb9ee88e18 | |
parent | 23d8e63a903bf8b6d9bf99bdd0e45aa901a90fff (diff) |
[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>
-rw-r--r-- | drivers/media/dvb/dvb-usb/dvb_usb_i2c.c | 39 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/dvb_usb_init.c | 31 |
2 files changed, 31 insertions, 39 deletions
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 index 202e1d1acffb..000000000000 --- a/drivers/media/dvb/dvb-usb/dvb_usb_i2c.c +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | /* dvb-usb-i2c.c is part of the DVB USB library. | ||
2 | * | ||
3 | * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@desy.de) | ||
4 | * see dvb-usb-init.c for copyright information. | ||
5 | * | ||
6 | * This file contains functions for (de-)initializing an I2C adapter. | ||
7 | */ | ||
8 | #include "dvb_usb_common.h" | ||
9 | |||
10 | int dvb_usb_i2c_init(struct dvb_usb_device *d) | ||
11 | { | ||
12 | int ret = 0; | ||
13 | |||
14 | if (!d->props.i2c_algo) | ||
15 | return 0; | ||
16 | |||
17 | strlcpy(d->i2c_adap.name, d->name, sizeof(d->i2c_adap.name)); | ||
18 | d->i2c_adap.algo = d->props.i2c_algo; | ||
19 | d->i2c_adap.algo_data = NULL; | ||
20 | d->i2c_adap.dev.parent = &d->udev->dev; | ||
21 | |||
22 | i2c_set_adapdata(&d->i2c_adap, d); | ||
23 | |||
24 | ret = i2c_add_adapter(&d->i2c_adap); | ||
25 | if (ret < 0) | ||
26 | pr_err("%s: could not add i2c adapter", KBUILD_MODNAME); | ||
27 | |||
28 | d->state |= DVB_USB_STATE_I2C; | ||
29 | |||
30 | return ret; | ||
31 | } | ||
32 | |||
33 | int dvb_usb_i2c_exit(struct dvb_usb_device *d) | ||
34 | { | ||
35 | if (d->state & DVB_USB_STATE_I2C) | ||
36 | i2c_del_adapter(&d->i2c_adap); | ||
37 | d->state &= ~DVB_USB_STATE_I2C; | ||
38 | return 0; | ||
39 | } | ||
diff --git a/drivers/media/dvb/dvb-usb/dvb_usb_init.c b/drivers/media/dvb/dvb-usb/dvb_usb_init.c index 9dcf4e525795..aa7caa5c4684 100644 --- 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: | |||
68 | return ret; | 68 | return ret; |
69 | } | 69 | } |
70 | 70 | ||
71 | int dvb_usb_i2c_init(struct dvb_usb_device *d) | ||
72 | { | ||
73 | int ret = 0; | ||
74 | |||
75 | if (!d->props.i2c_algo) | ||
76 | return 0; | ||
77 | |||
78 | strlcpy(d->i2c_adap.name, d->name, sizeof(d->i2c_adap.name)); | ||
79 | d->i2c_adap.algo = d->props.i2c_algo; | ||
80 | d->i2c_adap.algo_data = NULL; | ||
81 | d->i2c_adap.dev.parent = &d->udev->dev; | ||
82 | |||
83 | i2c_set_adapdata(&d->i2c_adap, d); | ||
84 | |||
85 | ret = i2c_add_adapter(&d->i2c_adap); | ||
86 | if (ret < 0) | ||
87 | pr_err("%s: could not add i2c adapter", KBUILD_MODNAME); | ||
88 | |||
89 | d->state |= DVB_USB_STATE_I2C; | ||
90 | |||
91 | return ret; | ||
92 | } | ||
93 | |||
94 | int dvb_usb_i2c_exit(struct dvb_usb_device *d) | ||
95 | { | ||
96 | if (d->state & DVB_USB_STATE_I2C) | ||
97 | i2c_del_adapter(&d->i2c_adap); | ||
98 | d->state &= ~DVB_USB_STATE_I2C; | ||
99 | return 0; | ||
100 | } | ||
101 | |||
71 | static int dvb_usb_adapter_init(struct dvb_usb_device *d) | 102 | static int dvb_usb_adapter_init(struct dvb_usb_device *d) |
72 | { | 103 | { |
73 | struct dvb_usb_adapter *adap; | 104 | struct dvb_usb_adapter *adap; |