drm/i915: s/\<rq\>/req/g

The merged seqno->request conversion from John called request
variables req, but some (not all) of Chris' recent patches changed
those to just rq. We've had a lenghty (and inconclusive) discussion on
irc which is the more meaningful name with maybe at most a slight bias
towards req.

Given that the "don't change names without good reason to avoid
conflicts" rule applies, so lets go back to a req everywhere for
consistency. I'll sed any patches for which this will cause conflicts
before applying.

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: John Harrison <John.C.Harrison@Intel.com>
[danvet: s/origina/merged/ as pointed out by Chris - the first
mass-conversion patch was from Chris, the merged one from John.]
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index a32b669bab89..f465af1b02f8 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -665,7 +665,7 @@ static int i915_gem_request_info(struct seq_file *m, void *data)
         struct drm_device *dev = node->minor->dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_engine_cs *ring;
-        struct drm_i915_gem_request *rq;
+        struct drm_i915_gem_request *req;
         int ret, any, i;
 
         ret = mutex_lock_interruptible(&dev->struct_mutex);
@@ -677,22 +677,22 @@ static int i915_gem_request_info(struct seq_file *m, void *data)
                 int count;
 
                 count = 0;
-                list_for_each_entry(rq, &ring->request_list, list)
+                list_for_each_entry(req, &ring->request_list, list)
                         count++;
                 if (count == 0)
                         continue;
 
                 seq_printf(m, "%s requests: %d\n", ring->name, count);
-                list_for_each_entry(rq, &ring->request_list, list) {
+                list_for_each_entry(req, &ring->request_list, list) {
                         struct task_struct *task;
 
                         rcu_read_lock();
                         task = NULL;
-                        if (rq->pid)
-                                task = pid_task(rq->pid, PIDTYPE_PID);
+                        if (req->pid)
+                                task = pid_task(req->pid, PIDTYPE_PID);
                         seq_printf(m, "    %x @ %d: %s [%d]\n",
-                                   rq->seqno,
-                                   (int) (jiffies - rq->emitted_jiffies),
+                                   req->seqno,
+                                   (int) (jiffies - req->emitted_jiffies),
                                    task ? task->comm : "<unknown>",
                                    task ? task->pid : -1);
                         rcu_read_unlock();