Commit 9aaffa34 authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by Daniel Vetter

drm/i915: remove unnecessary null test

While creating the debugfs file we are setting the inode->i_private to
dev. That same dev is passed to these functions as private of struct
seq_file via single_open(). Moreover single_open is setting
file->private_data->private to dev.
So at this point it can never be NULL.
This check was added by commit eb3394fa ("drm/i915: Add debugfs test
control files for Displayport compliance testing")
Signed-off-by: default avatarSudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 84e81020
...@@ -4028,24 +4028,14 @@ static ssize_t i915_displayport_test_active_write(struct file *file, ...@@ -4028,24 +4028,14 @@ static ssize_t i915_displayport_test_active_write(struct file *file,
{ {
char *input_buffer; char *input_buffer;
int status = 0; int status = 0;
struct seq_file *m;
struct drm_device *dev; struct drm_device *dev;
struct drm_connector *connector; struct drm_connector *connector;
struct list_head *connector_list; struct list_head *connector_list;
struct intel_dp *intel_dp; struct intel_dp *intel_dp;
int val = 0; int val = 0;
m = file->private_data; dev = ((struct seq_file *)file->private_data)->private;
if (!m) {
status = -ENODEV;
return status;
}
dev = m->private;
if (!dev) {
status = -ENODEV;
return status;
}
connector_list = &dev->mode_config.connector_list; connector_list = &dev->mode_config.connector_list;
if (len == 0) if (len == 0)
...@@ -4103,9 +4093,6 @@ static int i915_displayport_test_active_show(struct seq_file *m, void *data) ...@@ -4103,9 +4093,6 @@ static int i915_displayport_test_active_show(struct seq_file *m, void *data)
struct list_head *connector_list = &dev->mode_config.connector_list; struct list_head *connector_list = &dev->mode_config.connector_list;
struct intel_dp *intel_dp; struct intel_dp *intel_dp;
if (!dev)
return -ENODEV;
list_for_each_entry(connector, connector_list, head) { list_for_each_entry(connector, connector_list, head) {
if (connector->connector_type != if (connector->connector_type !=
...@@ -4150,9 +4137,6 @@ static int i915_displayport_test_data_show(struct seq_file *m, void *data) ...@@ -4150,9 +4137,6 @@ static int i915_displayport_test_data_show(struct seq_file *m, void *data)
struct list_head *connector_list = &dev->mode_config.connector_list; struct list_head *connector_list = &dev->mode_config.connector_list;
struct intel_dp *intel_dp; struct intel_dp *intel_dp;
if (!dev)
return -ENODEV;
list_for_each_entry(connector, connector_list, head) { list_for_each_entry(connector, connector_list, head) {
if (connector->connector_type != if (connector->connector_type !=
...@@ -4192,9 +4176,6 @@ static int i915_displayport_test_type_show(struct seq_file *m, void *data) ...@@ -4192,9 +4176,6 @@ static int i915_displayport_test_type_show(struct seq_file *m, void *data)
struct list_head *connector_list = &dev->mode_config.connector_list; struct list_head *connector_list = &dev->mode_config.connector_list;
struct intel_dp *intel_dp; struct intel_dp *intel_dp;
if (!dev)
return -ENODEV;
list_for_each_entry(connector, connector_list, head) { list_for_each_entry(connector, connector_list, head) {
if (connector->connector_type != if (connector->connector_type !=
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment