[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>

diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c
index 69272e4e34596a60b059a4d30f6eadddd4a473c3..696879e2eef77b2429fd8b52e77375a5032e45fc 100644 (file)
--- 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 = {
 static __devinitdata struct timb_radio_platform_data
        timberdale_radio_platform_data = {
        .i2c_adapter = 0,
-       .tuner = {
-               .info = &timberdale_tef6868_i2c_board_info
-       },
-       .dsp = {
-               .info = &timberdale_saa7706_i2c_board_info
-       }
+       .tuner = &timberdale_tef6868_i2c_board_info,
+       .dsp = &timberdale_saa7706_i2c_board_info
 };
 
 static const __devinitconst struct resource timberdale_video_resources[] = {

diff --git a/include/media/timb_radio.h b/include/media/timb_radio.h
index a59a84854dc1959d5ef2e6c7d4e4f261fcc2d5ce..a40a6a348d21b10ba5d75f439bcd8805ee8342fa 100644 (file)
--- a/include/media/timb_radio.h
+++ b/include/media/timb_radio.h
@@ -23,13 +23,8 @@
 
 struct timb_radio_platform_data {
        int i2c_adapter; /* I2C adapter where the tuner and dsp are attached */
-       struct {
-               struct i2c_board_info *info;
-       } tuner;
-       struct {
-               const char *module_name;
-               struct i2c_board_info *info;
-       } dsp;
+       struct i2c_board_info *tuner;
+       struct i2c_board_info *dsp;
 };
 
 #endif