diff options
author | Mats Randgaard <matrandg@cisco.com> | 2013-12-05 09:58:08 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-01-07 03:33:12 -0500 |
commit | 77a09f8bf16c66c4875abe4d51939287df044242 (patch) | |
tree | d6ab2d4243d909034c5f5a9af118a90b857529e3 | |
parent | 84aeed5310d7ea589ee703636d45bb56de0adb7f (diff) |
[media] adv7842: remove connector type. Never used for anything useful
May also be wrong if the receiver is connected to more than one connector.
Signed-off-by: Mats Randgaard <matrandg@cisco.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r-- | drivers/media/i2c/adv7842.c | 4 | ||||
-rw-r--r-- | include/media/adv7842.h | 3 |
2 files changed, 0 insertions, 7 deletions
diff --git a/drivers/media/i2c/adv7842.c b/drivers/media/i2c/adv7842.c index f16437ceed4a..ab448970bbd8 100644 --- a/drivers/media/i2c/adv7842.c +++ b/drivers/media/i2c/adv7842.c | |||
@@ -82,7 +82,6 @@ struct adv7842_state { | |||
82 | bool is_cea_format; | 82 | bool is_cea_format; |
83 | struct workqueue_struct *work_queues; | 83 | struct workqueue_struct *work_queues; |
84 | struct delayed_work delayed_work_enable_hotplug; | 84 | struct delayed_work delayed_work_enable_hotplug; |
85 | bool connector_hdmi; | ||
86 | bool hdmi_port_a; | 85 | bool hdmi_port_a; |
87 | 86 | ||
88 | /* i2c clients */ | 87 | /* i2c clients */ |
@@ -2166,8 +2165,6 @@ static int adv7842_cp_log_status(struct v4l2_subdev *sd) | |||
2166 | 2165 | ||
2167 | v4l2_info(sd, "-----Chip status-----\n"); | 2166 | v4l2_info(sd, "-----Chip status-----\n"); |
2168 | v4l2_info(sd, "Chip power: %s\n", no_power(sd) ? "off" : "on"); | 2167 | v4l2_info(sd, "Chip power: %s\n", no_power(sd) ? "off" : "on"); |
2169 | v4l2_info(sd, "Connector type: %s\n", state->connector_hdmi ? | ||
2170 | "HDMI" : (is_digital_input(sd) ? "DVI-D" : "DVI-A")); | ||
2171 | v4l2_info(sd, "HDMI/DVI-D port selected: %s\n", | 2168 | v4l2_info(sd, "HDMI/DVI-D port selected: %s\n", |
2172 | state->hdmi_port_a ? "A" : "B"); | 2169 | state->hdmi_port_a ? "A" : "B"); |
2173 | v4l2_info(sd, "EDID A %s, B %s\n", | 2170 | v4l2_info(sd, "EDID A %s, B %s\n", |
@@ -2801,7 +2798,6 @@ static int adv7842_probe(struct i2c_client *client, | |||
2801 | sd = &state->sd; | 2798 | sd = &state->sd; |
2802 | v4l2_i2c_subdev_init(sd, client, &adv7842_ops); | 2799 | v4l2_i2c_subdev_init(sd, client, &adv7842_ops); |
2803 | sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; | 2800 | sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; |
2804 | state->connector_hdmi = pdata->connector_hdmi; | ||
2805 | state->mode = pdata->mode; | 2801 | state->mode = pdata->mode; |
2806 | 2802 | ||
2807 | state->hdmi_port_a = pdata->input == ADV7842_SELECT_HDMI_PORT_A; | 2803 | state->hdmi_port_a = pdata->input == ADV7842_SELECT_HDMI_PORT_A; |
diff --git a/include/media/adv7842.h b/include/media/adv7842.h index c12de2d2f46f..24fed1198ce8 100644 --- a/include/media/adv7842.h +++ b/include/media/adv7842.h | |||
@@ -139,9 +139,6 @@ struct adv7842_sdp_io_sync_adjustment { | |||
139 | 139 | ||
140 | /* Platform dependent definition */ | 140 | /* Platform dependent definition */ |
141 | struct adv7842_platform_data { | 141 | struct adv7842_platform_data { |
142 | /* connector - HDMI or DVI? */ | ||
143 | unsigned connector_hdmi:1; | ||
144 | |||
145 | /* chip reset during probe */ | 142 | /* chip reset during probe */ |
146 | unsigned chip_reset:1; | 143 | unsigned chip_reset:1; |
147 | 144 | ||