[Intel-gfx] [PATCH 2/6] drm: Remove now pointelss blob->data casts

Sharma, Shashank shashank.sharma at intel.com
Thu Mar 1 08:57:55 UTC 2018


Regards

Shashank


On 2/24/2018 12:55 AM, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
>
> Now that blob->data is void* again we don't need the casts anymore.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> ---
>   drivers/gpu/drm/drm_atomic.c        | 3 +--
>   drivers/gpu/drm/drm_atomic_helper.c | 2 +-
>   drivers/gpu/drm/drm_edid.c          | 3 +--
>   drivers/gpu/drm/drm_fb_helper.c     | 2 +-
>   drivers/gpu/drm/drm_plane.c         | 2 +-
>   5 files changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
> index 46733d534587..8945357212ba 100644
> --- a/drivers/gpu/drm/drm_atomic.c
> +++ b/drivers/gpu/drm/drm_atomic.c
> @@ -391,8 +391,7 @@ int drm_atomic_set_mode_prop_for_crtc(struct drm_crtc_state *state,
>   	if (blob) {
>   		if (blob->length != sizeof(struct drm_mode_modeinfo) ||
>   		    drm_mode_convert_umode(state->crtc->dev, &state->mode,
> -		                           (const struct drm_mode_modeinfo *)
> -		                            blob->data))
> +					   blob->data))
>   			return -EINVAL;
>   
>   		state->mode_blob = drm_property_blob_get(blob);
> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
> index ae3cbfe9e01c..6211a1b20405 100644
> --- a/drivers/gpu/drm/drm_atomic_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_helper.c
> @@ -3816,7 +3816,7 @@ int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc,
>   	}
>   
>   	/* Prepare GAMMA_LUT with the legacy values. */
> -	blob_data = (struct drm_color_lut *) blob->data;
> +	blob_data = blob->data;
>   	for (i = 0; i < size; i++) {
>   		blob_data[i].red = red[i];
>   		blob_data[i].green = green[i];
> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> index 788fee4b4bf9..134069f36482 100644
> --- a/drivers/gpu/drm/drm_edid.c
> +++ b/drivers/gpu/drm/drm_edid.c
> @@ -1575,8 +1575,7 @@ struct edid *drm_do_get_edid(struct drm_connector *connector,
>   	struct edid *override = NULL;
>   
>   	if (connector->override_edid)
> -		override = drm_edid_duplicate((const struct edid *)
> -					      connector->edid_blob_ptr->data);
> +		override = drm_edid_duplicate(connector->edid_blob_ptr->data);
>   
>   	if (!override)
>   		override = drm_load_edid_firmware(connector);
> diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
> index 035784ddd133..0646b108030b 100644
> --- a/drivers/gpu/drm/drm_fb_helper.c
> +++ b/drivers/gpu/drm/drm_fb_helper.c
> @@ -1351,7 +1351,7 @@ static struct drm_property_blob *setcmap_new_gamma_lut(struct drm_crtc *crtc,
>   	if (IS_ERR(gamma_lut))
>   		return gamma_lut;
>   
> -	lut = (struct drm_color_lut *)gamma_lut->data;
> +	lut = gamma_lut->data;
>   	if (cmap->start || cmap->len != size) {
>   		u16 *r = crtc->gamma_store;
>   		u16 *g = r + crtc->gamma_size;
> diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c
> index 09de6ecb3968..9851616cf0f3 100644
> --- a/drivers/gpu/drm/drm_plane.c
> +++ b/drivers/gpu/drm/drm_plane.c
> @@ -104,7 +104,7 @@ static int create_in_format_blob(struct drm_device *dev, struct drm_plane *plane
>   	if (IS_ERR(blob))
>   		return -1;
>   
> -	blob_data = (struct drm_format_modifier_blob *)blob->data;
> +	blob_data = blob->data;
Reviewed-by: Shashank Sharma <shashank.sharma at intel.com>
>   	blob_data->version = FORMAT_BLOB_CURRENT;
>   	blob_data->count_formats = plane->format_count;
>   	blob_data->formats_offset = sizeof(struct drm_format_modifier_blob);



More information about the Intel-gfx mailing list