| Message ID | 4d71ed8a432b4121516049334512d35623c8acaa.1547629303.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: switch to kernel fixed size types | expand |
On Wed, 2019-01-16 at 11:15 +0200, Jani Nikula wrote: > Mixed C99 and kernel types use is getting ugly. Prefer kernel > types. > > sed -i 's/\buint\(8\|16\|32\|64\)_t\b/u\1/g' Reviewed-by: José Roberto de Souza <jose.souza@intel.com> > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/i915_debugfs.c | 22 +++++++++++----------- > 1 file changed, 11 insertions(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c > b/drivers/gpu/drm/i915/i915_debugfs.c > index 8d738e6ca7b5..fc78e45778b5 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -2249,7 +2249,7 @@ static void i915_guc_client_info(struct > seq_file *m, > { > struct intel_engine_cs *engine; > enum intel_engine_id id; > - uint64_t tot = 0; > + u64 tot = 0; > > seq_printf(m, "\tPriority %d, GuC stage index: %u, PD offset > 0x%x\n", > client->priority, client->stage_id, client- > >proc_desc_offset); > @@ -3637,7 +3637,7 @@ static int > i915_displayport_test_type_show(struct seq_file *m, void *data) > } > DEFINE_SHOW_ATTRIBUTE(i915_displayport_test_type); > > -static void wm_latency_show(struct seq_file *m, const uint16_t > wm[8]) > +static void wm_latency_show(struct seq_file *m, const u16 wm[8]) > { > struct drm_i915_private *dev_priv = m->private; > struct drm_device *dev = &dev_priv->drm; > @@ -3680,7 +3680,7 @@ static void wm_latency_show(struct seq_file *m, > const uint16_t wm[8]) > static int pri_wm_latency_show(struct seq_file *m, void *data) > { > struct drm_i915_private *dev_priv = m->private; > - const uint16_t *latencies; > + const u16 *latencies; > > if (INTEL_GEN(dev_priv) >= 9) > latencies = dev_priv->wm.skl_latency; > @@ -3695,7 +3695,7 @@ static int pri_wm_latency_show(struct seq_file > *m, void *data) > static int spr_wm_latency_show(struct seq_file *m, void *data) > { > struct drm_i915_private *dev_priv = m->private; > - const uint16_t *latencies; > + const u16 *latencies; > > if (INTEL_GEN(dev_priv) >= 9) > latencies = dev_priv->wm.skl_latency; > @@ -3710,7 +3710,7 @@ static int spr_wm_latency_show(struct seq_file > *m, void *data) > static int cur_wm_latency_show(struct seq_file *m, void *data) > { > struct drm_i915_private *dev_priv = m->private; > - const uint16_t *latencies; > + const u16 *latencies; > > if (INTEL_GEN(dev_priv) >= 9) > latencies = dev_priv->wm.skl_latency; > @@ -3753,12 +3753,12 @@ static int cur_wm_latency_open(struct inode > *inode, struct file *file) > } > > static ssize_t wm_latency_write(struct file *file, const char __user > *ubuf, > - size_t len, loff_t *offp, uint16_t > wm[8]) > + size_t len, loff_t *offp, u16 wm[8]) > { > struct seq_file *m = file->private_data; > struct drm_i915_private *dev_priv = m->private; > struct drm_device *dev = &dev_priv->drm; > - uint16_t new[8] = { 0 }; > + u16 new[8] = { 0 }; > int num_levels; > int level; > int ret; > @@ -3803,7 +3803,7 @@ static ssize_t pri_wm_latency_write(struct file > *file, const char __user *ubuf, > { > struct seq_file *m = file->private_data; > struct drm_i915_private *dev_priv = m->private; > - uint16_t *latencies; > + u16 *latencies; > > if (INTEL_GEN(dev_priv) >= 9) > latencies = dev_priv->wm.skl_latency; > @@ -3818,7 +3818,7 @@ static ssize_t spr_wm_latency_write(struct file > *file, const char __user *ubuf, > { > struct seq_file *m = file->private_data; > struct drm_i915_private *dev_priv = m->private; > - uint16_t *latencies; > + u16 *latencies; > > if (INTEL_GEN(dev_priv) >= 9) > latencies = dev_priv->wm.skl_latency; > @@ -3833,7 +3833,7 @@ static ssize_t cur_wm_latency_write(struct file > *file, const char __user *ubuf, > { > struct seq_file *m = file->private_data; > struct drm_i915_private *dev_priv = m->private; > - uint16_t *latencies; > + u16 *latencies; > > if (INTEL_GEN(dev_priv) >= 9) > latencies = dev_priv->wm.skl_latency; > @@ -4851,7 +4851,7 @@ static int i915_dpcd_show(struct seq_file *m, > void *data) > struct drm_connector *connector = m->private; > struct intel_dp *intel_dp = > enc_to_intel_dp(&intel_attached_encoder(connector)- > >base); > - uint8_t buf[16]; > + u8 buf[16]; > ssize_t err; > int i; >
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 8d738e6ca7b5..fc78e45778b5 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -2249,7 +2249,7 @@ static void i915_guc_client_info(struct seq_file *m, { struct intel_engine_cs *engine; enum intel_engine_id id; - uint64_t tot = 0; + u64 tot = 0; seq_printf(m, "\tPriority %d, GuC stage index: %u, PD offset 0x%x\n", client->priority, client->stage_id, client->proc_desc_offset); @@ -3637,7 +3637,7 @@ static int i915_displayport_test_type_show(struct seq_file *m, void *data) } DEFINE_SHOW_ATTRIBUTE(i915_displayport_test_type); -static void wm_latency_show(struct seq_file *m, const uint16_t wm[8]) +static void wm_latency_show(struct seq_file *m, const u16 wm[8]) { struct drm_i915_private *dev_priv = m->private; struct drm_device *dev = &dev_priv->drm; @@ -3680,7 +3680,7 @@ static void wm_latency_show(struct seq_file *m, const uint16_t wm[8]) static int pri_wm_latency_show(struct seq_file *m, void *data) { struct drm_i915_private *dev_priv = m->private; - const uint16_t *latencies; + const u16 *latencies; if (INTEL_GEN(dev_priv) >= 9) latencies = dev_priv->wm.skl_latency; @@ -3695,7 +3695,7 @@ static int pri_wm_latency_show(struct seq_file *m, void *data) static int spr_wm_latency_show(struct seq_file *m, void *data) { struct drm_i915_private *dev_priv = m->private; - const uint16_t *latencies; + const u16 *latencies; if (INTEL_GEN(dev_priv) >= 9) latencies = dev_priv->wm.skl_latency; @@ -3710,7 +3710,7 @@ static int spr_wm_latency_show(struct seq_file *m, void *data) static int cur_wm_latency_show(struct seq_file *m, void *data) { struct drm_i915_private *dev_priv = m->private; - const uint16_t *latencies; + const u16 *latencies; if (INTEL_GEN(dev_priv) >= 9) latencies = dev_priv->wm.skl_latency; @@ -3753,12 +3753,12 @@ static int cur_wm_latency_open(struct inode *inode, struct file *file) } static ssize_t wm_latency_write(struct file *file, const char __user *ubuf, - size_t len, loff_t *offp, uint16_t wm[8]) + size_t len, loff_t *offp, u16 wm[8]) { struct seq_file *m = file->private_data; struct drm_i915_private *dev_priv = m->private; struct drm_device *dev = &dev_priv->drm; - uint16_t new[8] = { 0 }; + u16 new[8] = { 0 }; int num_levels; int level; int ret; @@ -3803,7 +3803,7 @@ static ssize_t pri_wm_latency_write(struct file *file, const char __user *ubuf, { struct seq_file *m = file->private_data; struct drm_i915_private *dev_priv = m->private; - uint16_t *latencies; + u16 *latencies; if (INTEL_GEN(dev_priv) >= 9) latencies = dev_priv->wm.skl_latency; @@ -3818,7 +3818,7 @@ static ssize_t spr_wm_latency_write(struct file *file, const char __user *ubuf, { struct seq_file *m = file->private_data; struct drm_i915_private *dev_priv = m->private; - uint16_t *latencies; + u16 *latencies; if (INTEL_GEN(dev_priv) >= 9) latencies = dev_priv->wm.skl_latency; @@ -3833,7 +3833,7 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf, { struct seq_file *m = file->private_data; struct drm_i915_private *dev_priv = m->private; - uint16_t *latencies; + u16 *latencies; if (INTEL_GEN(dev_priv) >= 9) latencies = dev_priv->wm.skl_latency; @@ -4851,7 +4851,7 @@ static int i915_dpcd_show(struct seq_file *m, void *data) struct drm_connector *connector = m->private; struct intel_dp *intel_dp = enc_to_intel_dp(&intel_attached_encoder(connector)->base); - uint8_t buf[16]; + u8 buf[16]; ssize_t err; int i;
Mixed C99 and kernel types use is getting ugly. Prefer kernel types. sed -i 's/\buint\(8\|16\|32\|64\)_t\b/u\1/g' Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/i915_debugfs.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)