diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-01-09 12:32:41 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2006-01-09 12:32:41 -0500 |
commit | d92c20e0a5b560bbe46d7e68bb47df2366cddf8f (patch) | |
tree | 6fe906f5fb4c7bb3d3581a298ffb2ad864f43545 /drivers/media/video/cx25840/cx25840-firmware.c | |
parent | fac9e89999a12f378112fe93764b30196bc03f46 (diff) |
V4L/DVB (3279): Added VIDIOC_QUERYCTRL to cx25840.
- Added VIDIOC_QUERYCTRL
- Removed unnecessary inlines.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'drivers/media/video/cx25840/cx25840-firmware.c')
-rw-r--r-- | drivers/media/video/cx25840/cx25840-firmware.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/video/cx25840/cx25840-firmware.c b/drivers/media/video/cx25840/cx25840-firmware.c index 12a73e64f756..e1a7823d82cd 100644 --- a/drivers/media/video/cx25840/cx25840-firmware.c +++ b/drivers/media/video/cx25840/cx25840-firmware.c | |||
@@ -37,7 +37,7 @@ module_param(firmware, charp, 0444); | |||
37 | MODULE_PARM_DESC(fastfw, "Load firmware fast [0=100MHz 1=333MHz (default)]"); | 37 | MODULE_PARM_DESC(fastfw, "Load firmware fast [0=100MHz 1=333MHz (default)]"); |
38 | MODULE_PARM_DESC(firmware, "Firmware image [default: " FWFILE "]"); | 38 | MODULE_PARM_DESC(firmware, "Firmware image [default: " FWFILE "]"); |
39 | 39 | ||
40 | static inline void set_i2c_delay(struct i2c_client *client, int delay) | 40 | static void set_i2c_delay(struct i2c_client *client, int delay) |
41 | { | 41 | { |
42 | struct i2c_algo_bit_data *algod = client->adapter->algo_data; | 42 | struct i2c_algo_bit_data *algod = client->adapter->algo_data; |
43 | 43 | ||
@@ -51,7 +51,7 @@ static inline void set_i2c_delay(struct i2c_client *client, int delay) | |||
51 | } | 51 | } |
52 | } | 52 | } |
53 | 53 | ||
54 | static inline void start_fw_load(struct i2c_client *client) | 54 | static void start_fw_load(struct i2c_client *client) |
55 | { | 55 | { |
56 | /* DL_ADDR_LB=0 DL_ADDR_HB=0 */ | 56 | /* DL_ADDR_LB=0 DL_ADDR_HB=0 */ |
57 | cx25840_write(client, 0x800, 0x00); | 57 | cx25840_write(client, 0x800, 0x00); |
@@ -65,7 +65,7 @@ static inline void start_fw_load(struct i2c_client *client) | |||
65 | set_i2c_delay(client, 3); | 65 | set_i2c_delay(client, 3); |
66 | } | 66 | } |
67 | 67 | ||
68 | static inline void end_fw_load(struct i2c_client *client) | 68 | static void end_fw_load(struct i2c_client *client) |
69 | { | 69 | { |
70 | if (fastfw) | 70 | if (fastfw) |
71 | set_i2c_delay(client, 10); | 71 | set_i2c_delay(client, 10); |
@@ -76,7 +76,7 @@ static inline void end_fw_load(struct i2c_client *client) | |||
76 | cx25840_write(client, 0x803, 0x03); | 76 | cx25840_write(client, 0x803, 0x03); |
77 | } | 77 | } |
78 | 78 | ||
79 | static inline int check_fw_load(struct i2c_client *client, int size) | 79 | static int check_fw_load(struct i2c_client *client, int size) |
80 | { | 80 | { |
81 | /* DL_ADDR_HB DL_ADDR_LB */ | 81 | /* DL_ADDR_HB DL_ADDR_LB */ |
82 | int s = cx25840_read(client, 0x801) << 8; | 82 | int s = cx25840_read(client, 0x801) << 8; |
@@ -91,7 +91,7 @@ static inline int check_fw_load(struct i2c_client *client, int size) | |||
91 | return 0; | 91 | return 0; |
92 | } | 92 | } |
93 | 93 | ||
94 | static inline int fw_write(struct i2c_client *client, u8 * data, int size) | 94 | static int fw_write(struct i2c_client *client, u8 * data, int size) |
95 | { | 95 | { |
96 | int sent; | 96 | int sent; |
97 | 97 | ||