add boot partition size

hc

2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d

 kernel/drivers/media/platform/rcar_fdp1.c
..
..
@@ -947,7 +947,7 @@
947
947
 	u32 rndctl;
948
948
 
949
949
 	pstride = q_data->format.plane_fmt[0].bytesperline
950
-			<< FD1_WPF_PSTRIDE_Y_SHIFT;
950
+		<< FD1_WPF_PSTRIDE_Y_SHIFT;
951
951
 
952
952
 	if (q_data->format.num_planes > 1)
953
953
 		pstride |= q_data->format.plane_fmt[1].bytesperline
..
..
@@ -1141,8 +1141,8 @@
1141
1141
 	int dstbufs = 1;
1142
1142
 
1143
1143
 	dprintk(ctx->fdp1, "+ Src: %d : Dst: %d\n",
1144
-			v4l2_m2m_num_src_bufs_ready(ctx->fh.m2m_ctx),
1145
-			v4l2_m2m_num_dst_bufs_ready(ctx->fh.m2m_ctx));
1144
+		v4l2_m2m_num_src_bufs_ready(ctx->fh.m2m_ctx),
1145
+		v4l2_m2m_num_dst_bufs_ready(ctx->fh.m2m_ctx));
1146
1146
 
1147
1147
 	/* One output buffer is required for each field */
1148
1148
 	if (V4L2_FIELD_HAS_BOTH(src_q_data->format.field))
..
..
@@ -1280,7 +1280,7 @@
1280
1280
 
1281
1281
 		fdp1_queue_field(ctx, fbuf);
1282
1282
 		dprintk(fdp1, "Queued Buffer [%d] last_field:%d\n",
1283
-				i, fbuf->last_field);
1283
+			i, fbuf->last_field);
1284
1284
 	}
1285
1285
 
1286
1286
 	/* Queue as many jobs as our data provides for */
..
..
@@ -1339,7 +1339,7 @@
1339
1339
 	fdp1_job_free(fdp1, job);
1340
1340
 
1341
1341
 	dprintk(fdp1, "curr_ctx->num_processed %d curr_ctx->translen %d\n",
1342
-			ctx->num_processed, ctx->translen);
1342
+		ctx->num_processed, ctx->translen);
1343
1343
 
1344
1344
 	if (ctx->num_processed == ctx->translen ||
1345
1345
 			ctx->aborting) {
..
..
@@ -1361,10 +1361,10 @@
1361
1361
 static int fdp1_vidioc_querycap(struct file *file, void *priv,
1362
1362
 			   struct v4l2_capability *cap)
1363
1363
 {
1364
-	strlcpy(cap->driver, DRIVER_NAME, sizeof(cap->driver));
1365
-	strlcpy(cap->card, DRIVER_NAME, sizeof(cap->card));
1364
+	strscpy(cap->driver, DRIVER_NAME, sizeof(cap->driver));
1365
+	strscpy(cap->card, DRIVER_NAME, sizeof(cap->card));
1366
1366
 	snprintf(cap->bus_info, sizeof(cap->bus_info),
1367
-			"platform:%s", DRIVER_NAME);
1367
+		 "platform:%s", DRIVER_NAME);
1368
1368
 	return 0;
1369
1369
 }
1370
1370
 
..
..
@@ -1732,8 +1732,8 @@
1732
1732
 static const struct v4l2_ioctl_ops fdp1_ioctl_ops = {
1733
1733
 	.vidioc_querycap	= fdp1_vidioc_querycap,
1734
1734
 
1735
-	.vidioc_enum_fmt_vid_cap_mplane = fdp1_enum_fmt_vid_cap,
1736
-	.vidioc_enum_fmt_vid_out_mplane = fdp1_enum_fmt_vid_out,
1735
+	.vidioc_enum_fmt_vid_cap	= fdp1_enum_fmt_vid_cap,
1736
+	.vidioc_enum_fmt_vid_out	= fdp1_enum_fmt_vid_out,
1737
1737
 	.vidioc_g_fmt_vid_cap_mplane	= fdp1_g_fmt,
1738
1738
 	.vidioc_g_fmt_vid_out_mplane	= fdp1_g_fmt,
1739
1739
 	.vidioc_try_fmt_vid_cap_mplane	= fdp1_try_fmt,
..
..
@@ -1995,13 +1995,13 @@
1995
1995
 		/* Free smsk_data */
1996
1996
 		if (ctx->smsk_cpu) {
1997
1997
 			dma_free_coherent(ctx->fdp1->dev, ctx->smsk_size,
1998
-					ctx->smsk_cpu, ctx->smsk_addr[0]);
1998
+					  ctx->smsk_cpu, ctx->smsk_addr[0]);
1999
1999
 			ctx->smsk_addr[0] = ctx->smsk_addr[1] = 0;
2000
2000
 			ctx->smsk_cpu = NULL;
2001
2001
 		}
2002
2002
 
2003
2003
 		WARN(!list_empty(&ctx->fields_queue),
2004
-				"Buffer queue not empty");
2004
+		     "Buffer queue not empty");
2005
2005
 	} else {
2006
2006
 		/* Empty Capture queues (Jobs) */
2007
2007
 		struct fdp1_job *job;
..
..
@@ -2023,10 +2023,10 @@
2023
2023
 		fdp1_field_complete(ctx, ctx->previous);
2024
2024
 
2025
2025
 		WARN(!list_empty(&ctx->fdp1->queued_job_list),
2026
-				"Queued Job List not empty");
2026
+		     "Queued Job List not empty");
2027
2027
 
2028
2028
 		WARN(!list_empty(&ctx->fdp1->hw_job_list),
2029
-				"HW Job list not empty");
2029
+		     "HW Job list not empty");
2030
2030
 	}
2031
2031
 }
2032
2032
 
..
..
@@ -2112,7 +2112,7 @@
2112
2112
 				     fdp1_ctrl_deint_menu);
2113
2113
 
2114
2114
 	ctrl = v4l2_ctrl_new_std(&ctx->hdl, &fdp1_ctrl_ops,
2115
-			V4L2_CID_MIN_BUFFERS_FOR_CAPTURE, 1, 2, 1, 1);
2115
+				 V4L2_CID_MIN_BUFFERS_FOR_CAPTURE, 1, 2, 1, 1);
2116
2116
 	if (ctrl)
2117
2117
 		ctrl->flags |= V4L2_CTRL_FLAG_VOLATILE;
2118
2118
 
..
..
@@ -2122,6 +2122,7 @@
2122
2122
 	if (ctx->hdl.error) {
2123
2123
 		ret = ctx->hdl.error;
2124
2124
 		v4l2_ctrl_handler_free(&ctx->hdl);
2125
+		kfree(ctx);
2125
2126
 		goto done;
2126
2127
 	}
2127
2128
 
..
..
@@ -2341,16 +2342,16 @@
2341
2342
 	vfd->lock = &fdp1->dev_mutex;
2342
2343
 	vfd->v4l2_dev = &fdp1->v4l2_dev;
2343
2344
 	video_set_drvdata(vfd, fdp1);
2344
-	strlcpy(vfd->name, fdp1_videodev.name, sizeof(vfd->name));
2345
+	strscpy(vfd->name, fdp1_videodev.name, sizeof(vfd->name));
2345
2346
 
2346
-	ret = video_register_device(vfd, VFL_TYPE_GRABBER, 0);
2347
+	ret = video_register_device(vfd, VFL_TYPE_VIDEO, 0);
2347
2348
 	if (ret) {
2348
2349
 		v4l2_err(&fdp1->v4l2_dev, "Failed to register video device\n");
2349
2350
 		goto release_m2m;
2350
2351
 	}
2351
2352
 
2352
-	v4l2_info(&fdp1->v4l2_dev,
2353
-			"Device registered as /dev/video%d\n", vfd->num);
2353
+	v4l2_info(&fdp1->v4l2_dev, "Device registered as /dev/video%d\n",
2354
+		  vfd->num);
2354
2355
 
2355
2356
 	/* Power up the cells to read HW */
2356
2357
 	pm_runtime_enable(&pdev->dev);
..
..
@@ -2375,7 +2376,7 @@
2375
2376
 		break;
2376
2377
 	default:
2377
2378
 		dev_err(fdp1->dev, "FDP1 Unidentifiable (0x%08x)\n",
2378
-				hw_version);
2379
+			hw_version);
2379
2380
 	}
2380
2381
 
2381
2382
 	/* Allow the hw to sleep until an open call puts it to use */