diff --git a/drivers/gpu/drm/rockchip/dw-dp.c b/drivers/gpu/drm/rockchip/dw-dp.c index 188e1195d272..2248cb6e8094 100644 --- a/drivers/gpu/drm/rockchip/dw-dp.c +++ b/drivers/gpu/drm/rockchip/dw-dp.c @@ -4984,25 +4984,22 @@ static const struct hdmi_codec_ops dw_dp_audio_codec_ops = { static int dw_dp_register_audio_driver(struct dw_dp *dp, struct dw_dp_audio *audio) { - struct hdmi_codec_pdata codec_data; - struct platform_device_info pdevinfo; - - codec_data.ops = &dw_dp_audio_codec_ops, - codec_data.spdif = 1, - codec_data.i2s = 1, - codec_data.max_i2s_channels = 8, - codec_data.data = audio, - - pdevinfo.parent = dp->dev, - pdevinfo.fwnode = dp->support_mst ? of_fwnode_handle(dp->mst_enc[audio->id].port_node) : - of_fwnode_handle(dp->dev->of_node), - pdevinfo.name = HDMI_CODEC_DRV_NAME, - pdevinfo.id = PLATFORM_DEVID_AUTO, - pdevinfo.res = NULL, - pdevinfo.num_res = 0, - pdevinfo.data = &codec_data, - pdevinfo.size_data = sizeof(codec_data), - pdevinfo.dma_mask = 0, + struct hdmi_codec_pdata codec_data = { + .ops = &dw_dp_audio_codec_ops, + .spdif = 1, + .i2s = 1, + .max_i2s_channels = 8, + .data = audio, + }; + struct platform_device_info pdevinfo = { + .parent = dp->dev, + .fwnode = dp->support_mst ? of_fwnode_handle(dp->mst_enc[audio->id].port_node) : + NULL, + .name = HDMI_CODEC_DRV_NAME, + .id = PLATFORM_DEVID_AUTO, + .data = &codec_data, + .size_data = sizeof(codec_data), + }; audio->format = AFMT_UNUSED; audio->pdev = platform_device_register_full(&pdevinfo);