@@ -993,7 +993,6 @@ static void platform_device_unregister_children(struct platform_device *pdev)
993993struct ipu_platform_reg {
994994 struct ipu_client_platformdata pdata ;
995995 const char * name ;
996- int reg_offset ;
997996};
998997
999998static const struct ipu_platform_reg client_reg [] = {
@@ -1021,15 +1020,13 @@ static const struct ipu_platform_reg client_reg[] = {
10211020 .dma [0 ] = IPUV3_CHANNEL_CSI0 ,
10221021 .dma [1 ] = - EINVAL ,
10231022 },
1024- .reg_offset = IPU_CM_CSI0_REG_OFS ,
10251023 .name = "imx-ipuv3-camera" ,
10261024 }, {
10271025 .pdata = {
10281026 .csi = 1 ,
10291027 .dma [0 ] = IPUV3_CHANNEL_CSI1 ,
10301028 .dma [1 ] = - EINVAL ,
10311029 },
1032- .reg_offset = IPU_CM_CSI1_REG_OFS ,
10331030 .name = "imx-ipuv3-camera" ,
10341031 },
10351032};
@@ -1051,19 +1048,9 @@ static int ipu_add_client_devices(struct ipu_soc *ipu, unsigned long ipu_base)
10511048 for (i = 0 ; i < ARRAY_SIZE (client_reg ); i ++ ) {
10521049 const struct ipu_platform_reg * reg = & client_reg [i ];
10531050 struct platform_device * pdev ;
1054- struct resource res ;
1055-
1056- if (reg -> reg_offset ) {
1057- memset (& res , 0 , sizeof (res ));
1058- res .flags = IORESOURCE_MEM ;
1059- res .start = ipu_base + ipu -> devtype -> cm_ofs + reg -> reg_offset ;
1060- res .end = res .start + PAGE_SIZE - 1 ;
1061- pdev = platform_device_register_resndata (dev , reg -> name ,
1062- id ++ , & res , 1 , & reg -> pdata , sizeof (reg -> pdata ));
1063- } else {
1064- pdev = platform_device_register_data (dev , reg -> name ,
1065- id ++ , & reg -> pdata , sizeof (reg -> pdata ));
1066- }
1051+
1052+ pdev = platform_device_register_data (dev , reg -> name ,
1053+ id ++ , & reg -> pdata , sizeof (reg -> pdata ));
10671054
10681055 if (IS_ERR (pdev )) {
10691056 ret = PTR_ERR (pdev );
0 commit comments