Skip to content

Commit

Permalink
drm/i915: remove unnecessary null test
Browse files Browse the repository at this point in the history
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 eb3394f ("drm/i915: Add debugfs test
control files for Displayport compliance testing")

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Sudip Mukherjee authored and Daniel Vetter committed Jul 21, 2015
1 parent 84e8102 commit 9aaffa3
Showing 1 changed file with 1 addition and 20 deletions.
21 changes: 1 addition & 20 deletions drivers/gpu/drm/i915/i915_debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -4028,24 +4028,14 @@ static ssize_t i915_displayport_test_active_write(struct file *file,
{
char *input_buffer;
int status = 0;
struct seq_file *m;
struct drm_device *dev;
struct drm_connector *connector;
struct list_head *connector_list;
struct intel_dp *intel_dp;
int val = 0;

m = file->private_data;
if (!m) {
status = -ENODEV;
return status;
}
dev = m->private;
dev = ((struct seq_file *)file->private_data)->private;

if (!dev) {
status = -ENODEV;
return status;
}
connector_list = &dev->mode_config.connector_list;

if (len == 0)
Expand Down Expand Up @@ -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 intel_dp *intel_dp;

if (!dev)
return -ENODEV;

list_for_each_entry(connector, connector_list, head) {

if (connector->connector_type !=
Expand Down Expand Up @@ -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 intel_dp *intel_dp;

if (!dev)
return -ENODEV;

list_for_each_entry(connector, connector_list, head) {

if (connector->connector_type !=
Expand Down Expand Up @@ -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 intel_dp *intel_dp;

if (!dev)
return -ENODEV;

list_for_each_entry(connector, connector_list, head) {

if (connector->connector_type !=
Expand Down

0 comments on commit 9aaffa3

Please sign in to comment.