[Intel-gfx] [PATCH 5/5] drm/i915: Don't cast void* pointers
Daniel Vetter
daniel at ffwll.ch
Tue May 13 18:45:46 CEST 2014
On Tue, May 13, 2014 at 03:30:28PM +0100, Damien Lespiau wrote:
> That's not necessary and makes the code not as neat as it could be.
>
> Signed-off-by: Damien Lespiau <damien.lespiau at intel.com>
Queued for -next, thanks for the patch.
-Daniel
> ---
> drivers/gpu/drm/i915/i915_debugfs.c | 74 ++++++++++++++++++-------------------
> 1 file changed, 37 insertions(+), 37 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index 6801987..2739bba 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -79,7 +79,7 @@ drm_add_fake_info_node(struct drm_minor *minor,
>
> static int i915_capabilities(struct seq_file *m, void *data)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> const struct intel_device_info *info = INTEL_INFO(dev);
>
> @@ -181,7 +181,7 @@ static void describe_ctx(struct seq_file *m, struct i915_hw_context *ctx)
>
> static int i915_gem_object_list_info(struct seq_file *m, void *data)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> uintptr_t list = (uintptr_t) node->info_ent->data;
> struct list_head *head;
> struct drm_device *dev = node->minor->dev;
> @@ -239,7 +239,7 @@ static int obj_rank_by_stolen(void *priv,
>
> static int i915_gem_stolen_list_info(struct seq_file *m, void *data)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> struct drm_i915_gem_object *obj;
> @@ -371,7 +371,7 @@ static int per_file_stats(int id, void *ptr, void *data)
>
> static int i915_gem_object_info(struct seq_file *m, void* data)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> u32 count, mappable_count, purgeable_count;
> @@ -474,7 +474,7 @@ static int i915_gem_object_info(struct seq_file *m, void* data)
>
> static int i915_gem_gtt_info(struct seq_file *m, void *data)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> uintptr_t list = (uintptr_t) node->info_ent->data;
> struct drm_i915_private *dev_priv = dev->dev_private;
> @@ -509,7 +509,7 @@ static int i915_gem_gtt_info(struct seq_file *m, void *data)
>
> static int i915_gem_pageflip_info(struct seq_file *m, void *data)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> unsigned long flags;
> struct intel_crtc *crtc;
> @@ -559,7 +559,7 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data)
>
> static int i915_gem_request_info(struct seq_file *m, void *data)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> struct intel_ring_buffer *ring;
> @@ -604,7 +604,7 @@ static void i915_ring_seqno_info(struct seq_file *m,
>
> static int i915_gem_seqno_info(struct seq_file *m, void *data)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> struct intel_ring_buffer *ring;
> @@ -627,7 +627,7 @@ static int i915_gem_seqno_info(struct seq_file *m, void *data)
>
> static int i915_interrupt_info(struct seq_file *m, void *data)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> struct intel_ring_buffer *ring;
> @@ -768,7 +768,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
>
> static int i915_gem_fence_regs_info(struct seq_file *m, void *data)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> int i, ret;
> @@ -797,7 +797,7 @@ static int i915_gem_fence_regs_info(struct seq_file *m, void *data)
>
> static int i915_hws_info(struct seq_file *m, void *data)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> struct intel_ring_buffer *ring;
> @@ -945,7 +945,7 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_next_seqno_fops,
>
> static int i915_rstdby_delays(struct seq_file *m, void *unused)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> u16 crstanddelay;
> @@ -968,7 +968,7 @@ static int i915_rstdby_delays(struct seq_file *m, void *unused)
>
> static int i915_frequency_info(struct seq_file *m, void *unused)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> int ret = 0;
> @@ -1108,7 +1108,7 @@ out:
>
> static int i915_delayfreq_table(struct seq_file *m, void *unused)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> u32 delayfreq;
> @@ -1139,7 +1139,7 @@ static inline int MAP_TO_MV(int map)
>
> static int i915_inttoext_table(struct seq_file *m, void *unused)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> u32 inttoext;
> @@ -1163,7 +1163,7 @@ static int i915_inttoext_table(struct seq_file *m, void *unused)
>
> static int ironlake_drpc_info(struct seq_file *m)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> u32 rgvmodectl, rstdbyctl;
> @@ -1233,7 +1233,7 @@ static int ironlake_drpc_info(struct seq_file *m)
> static int vlv_drpc_info(struct seq_file *m)
> {
>
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> u32 rpmodectl1, rcctl1;
> @@ -1286,7 +1286,7 @@ static int vlv_drpc_info(struct seq_file *m)
> static int gen6_drpc_info(struct seq_file *m)
> {
>
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> u32 rpmodectl1, gt_core_status, rcctl1, rc6vids = 0;
> @@ -1385,7 +1385,7 @@ static int gen6_drpc_info(struct seq_file *m)
>
> static int i915_drpc_info(struct seq_file *m, void *unused)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
>
> if (IS_VALLEYVIEW(dev))
> @@ -1398,7 +1398,7 @@ static int i915_drpc_info(struct seq_file *m, void *unused)
>
> static int i915_fbc_status(struct seq_file *m, void *unused)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
>
> @@ -1460,7 +1460,7 @@ static int i915_fbc_status(struct seq_file *m, void *unused)
>
> static int i915_ips_status(struct seq_file *m, void *unused)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
>
> @@ -1483,7 +1483,7 @@ static int i915_ips_status(struct seq_file *m, void *unused)
>
> static int i915_sr_status(struct seq_file *m, void *unused)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> bool sr_enabled = false;
> @@ -1509,7 +1509,7 @@ static int i915_sr_status(struct seq_file *m, void *unused)
>
> static int i915_emon_status(struct seq_file *m, void *unused)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> unsigned long temp, chipset, gfx;
> @@ -1537,7 +1537,7 @@ static int i915_emon_status(struct seq_file *m, void *unused)
>
> static int i915_ring_freq_table(struct seq_file *m, void *unused)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> int ret = 0;
> @@ -1580,7 +1580,7 @@ out:
>
> static int i915_gfxec(struct seq_file *m, void *unused)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> int ret;
> @@ -1600,7 +1600,7 @@ static int i915_gfxec(struct seq_file *m, void *unused)
>
> static int i915_opregion(struct seq_file *m, void *unused)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> struct intel_opregion *opregion = &dev_priv->opregion;
> @@ -1628,7 +1628,7 @@ out:
>
> static int i915_gem_framebuffer_info(struct seq_file *m, void *data)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> struct intel_fbdev *ifbdev = NULL;
> struct intel_framebuffer *fb;
> @@ -1674,7 +1674,7 @@ static int i915_gem_framebuffer_info(struct seq_file *m, void *data)
>
> static int i915_context_status(struct seq_file *m, void *unused)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> struct intel_ring_buffer *ring;
> @@ -1718,7 +1718,7 @@ static int i915_context_status(struct seq_file *m, void *unused)
>
> static int i915_gen6_forcewake_count_info(struct seq_file *m, void *data)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> unsigned forcewake_count = 0, fw_rendercount = 0, fw_mediacount = 0;
> @@ -1766,7 +1766,7 @@ static const char *swizzle_string(unsigned swizzle)
>
> static int i915_swizzle_info(struct seq_file *m, void *data)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> int ret;
> @@ -1890,7 +1890,7 @@ static void gen6_ppgtt_info(struct seq_file *m, struct drm_device *dev)
>
> static int i915_ppgtt_info(struct seq_file *m, void *data)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
>
> @@ -1912,7 +1912,7 @@ static int i915_ppgtt_info(struct seq_file *m, void *data)
>
> static int i915_llc(struct seq_file *m, void *data)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
>
> @@ -2018,7 +2018,7 @@ static int i915_energy_uJ(struct seq_file *m, void *data)
>
> static int i915_pc8_status(struct seq_file *m, void *unused)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
>
> @@ -2093,7 +2093,7 @@ static const char *power_domain_str(enum intel_display_power_domain domain)
>
> static int i915_power_domain_info(struct seq_file *m, void *unused)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> struct i915_power_domains *power_domains = &dev_priv->power_domains;
> @@ -2148,7 +2148,7 @@ static void intel_encoder_info(struct seq_file *m,
> struct intel_crtc *intel_crtc,
> struct intel_encoder *intel_encoder)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> struct drm_crtc *crtc = &intel_crtc->base;
> struct intel_connector *intel_connector;
> @@ -2175,7 +2175,7 @@ static void intel_encoder_info(struct seq_file *m,
>
> static void intel_crtc_info(struct seq_file *m, struct intel_crtc *intel_crtc)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> struct drm_crtc *crtc = &intel_crtc->base;
> struct intel_encoder *intel_encoder;
> @@ -2295,7 +2295,7 @@ static bool cursor_position(struct drm_device *dev, int pipe, int *x, int *y)
>
> static int i915_display_info(struct seq_file *m, void *unused)
> {
> - struct drm_info_node *node = (struct drm_info_node *) m->private;
> + struct drm_info_node *node = m->private;
> struct drm_device *dev = node->minor->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> struct intel_crtc *crtc;
> --
> 1.8.3.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
More information about the Intel-gfx
mailing list