diff options
author | Richard Röjfors <richard.rojfors@pelagicore.com> | 2011-06-10 10:48:48 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 16:53:07 -0400 |
commit | 9cd49719fda38613e9d7c712b11a54ea4ea005dc (patch) | |
tree | f5f949a754ce248d833bb5e327c8e75eb89eda15 | |
parent | 8c528d5e51af26fd71ca6b5e39dfd1b4bd34c505 (diff) |
[media] radio-timb: Simplified platform data
This patch simplifies the platform data slightly, by removing
unused elements.
Signed-off-by: Richard Röjfors <richard.rojfors@pelagicore.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/mfd/timberdale.c | 8 | ||||
-rw-r--r-- | include/media/timb_radio.h | 9 |
2 files changed, 4 insertions, 13 deletions
diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c index 69272e4e3459..696879e2eef7 100644 --- a/drivers/mfd/timberdale.c +++ b/drivers/mfd/timberdale.c | |||
@@ -287,12 +287,8 @@ static __devinitdata struct i2c_board_info timberdale_saa7706_i2c_board_info = { | |||
287 | static __devinitdata struct timb_radio_platform_data | 287 | static __devinitdata struct timb_radio_platform_data |
288 | timberdale_radio_platform_data = { | 288 | timberdale_radio_platform_data = { |
289 | .i2c_adapter = 0, | 289 | .i2c_adapter = 0, |
290 | .tuner = { | 290 | .tuner = &timberdale_tef6868_i2c_board_info, |
291 | .info = &timberdale_tef6868_i2c_board_info | 291 | .dsp = &timberdale_saa7706_i2c_board_info |
292 | }, | ||
293 | .dsp = { | ||
294 | .info = &timberdale_saa7706_i2c_board_info | ||
295 | } | ||
296 | }; | 292 | }; |
297 | 293 | ||
298 | static const __devinitconst struct resource timberdale_video_resources[] = { | 294 | static const __devinitconst struct resource timberdale_video_resources[] = { |
diff --git a/include/media/timb_radio.h b/include/media/timb_radio.h index a59a84854dc1..a40a6a348d21 100644 --- a/include/media/timb_radio.h +++ b/include/media/timb_radio.h | |||
@@ -23,13 +23,8 @@ | |||
23 | 23 | ||
24 | struct timb_radio_platform_data { | 24 | struct timb_radio_platform_data { |
25 | int i2c_adapter; /* I2C adapter where the tuner and dsp are attached */ | 25 | int i2c_adapter; /* I2C adapter where the tuner and dsp are attached */ |
26 | struct { | 26 | struct i2c_board_info *tuner; |
27 | struct i2c_board_info *info; | 27 | struct i2c_board_info *dsp; |
28 | } tuner; | ||
29 | struct { | ||
30 | const char *module_name; | ||
31 | struct i2c_board_info *info; | ||
32 | } dsp; | ||
33 | }; | 28 | }; |
34 | 29 | ||
35 | #endif | 30 | #endif |