Skip to content

Commit 21d8582

Browse files
pinchartlmchehab
pinchartl
authored and
mchehab
committed
[media] omap3isp: Rename isp_buffer isp_addr field to dma
No functional changes. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Sakari Ailus <sakari.ailus@iki.fi> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
1 parent fbac140 commit 21d8582

File tree

7 files changed

+17
-17
lines changed

7 files changed

+17
-17
lines changed

‎drivers/media/platform/omap3isp/ispccdc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1521,7 +1521,7 @@ static int ccdc_isr_buffer(struct isp_ccdc_device *ccdc)
15211521

15221522
buffer = omap3isp_video_buffer_next(&ccdc->video_out);
15231523
if (buffer != NULL) {
1524-
ccdc_set_outaddr(ccdc, buffer->isp_addr);
1524+
ccdc_set_outaddr(ccdc, buffer->dma);
15251525
restart = 1;
15261526
}
15271527

@@ -1660,7 +1660,7 @@ static int ccdc_video_queue(struct isp_video *video, struct isp_buffer *buffer)
16601660
if (!(ccdc->output & CCDC_OUTPUT_MEMORY))
16611661
return -ENODEV;
16621662

1663-
ccdc_set_outaddr(ccdc, buffer->isp_addr);
1663+
ccdc_set_outaddr(ccdc, buffer->dma);
16641664

16651665
/* We now have a buffer queued on the output, restart the pipeline
16661666
* on the next CCDC interrupt if running in continuous mode (or when

‎drivers/media/platform/omap3isp/ispccp2.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ static void ccp2_isr_buffer(struct isp_ccp2_device *ccp2)
549549

550550
buffer = omap3isp_video_buffer_next(&ccp2->video_in);
551551
if (buffer != NULL)
552-
ccp2_set_inaddr(ccp2, buffer->isp_addr);
552+
ccp2_set_inaddr(ccp2, buffer->dma);
553553

554554
pipe->state |= ISP_PIPELINE_IDLE_INPUT;
555555

@@ -940,7 +940,7 @@ static int ccp2_video_queue(struct isp_video *video, struct isp_buffer *buffer)
940940
{
941941
struct isp_ccp2_device *ccp2 = &video->isp->isp_ccp2;
942942

943-
ccp2_set_inaddr(ccp2, buffer->isp_addr);
943+
ccp2_set_inaddr(ccp2, buffer->dma);
944944
return 0;
945945
}
946946

‎drivers/media/platform/omap3isp/ispcsi2.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ static void csi2_isr_buffer(struct isp_csi2_device *csi2)
695695
if (buffer == NULL)
696696
return;
697697

698-
csi2_set_outaddr(csi2, buffer->isp_addr);
698+
csi2_set_outaddr(csi2, buffer->dma);
699699
csi2_ctx_enable(isp, csi2, 0, 1);
700700
}
701701

@@ -812,7 +812,7 @@ static int csi2_queue(struct isp_video *video, struct isp_buffer *buffer)
812812
struct isp_device *isp = video->isp;
813813
struct isp_csi2_device *csi2 = &isp->isp_csi2a;
814814

815-
csi2_set_outaddr(csi2, buffer->isp_addr);
815+
csi2_set_outaddr(csi2, buffer->dma);
816816

817817
/*
818818
* If streaming was enabled before there was a buffer queued

‎drivers/media/platform/omap3isp/isppreview.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1499,14 +1499,14 @@ static void preview_isr_buffer(struct isp_prev_device *prev)
14991499
if (prev->input == PREVIEW_INPUT_MEMORY) {
15001500
buffer = omap3isp_video_buffer_next(&prev->video_in);
15011501
if (buffer != NULL)
1502-
preview_set_inaddr(prev, buffer->isp_addr);
1502+
preview_set_inaddr(prev, buffer->dma);
15031503
pipe->state |= ISP_PIPELINE_IDLE_INPUT;
15041504
}
15051505

15061506
if (prev->output & PREVIEW_OUTPUT_MEMORY) {
15071507
buffer = omap3isp_video_buffer_next(&prev->video_out);
15081508
if (buffer != NULL) {
1509-
preview_set_outaddr(prev, buffer->isp_addr);
1509+
preview_set_outaddr(prev, buffer->dma);
15101510
restart = 1;
15111511
}
15121512
pipe->state |= ISP_PIPELINE_IDLE_OUTPUT;
@@ -1577,10 +1577,10 @@ static int preview_video_queue(struct isp_video *video,
15771577
struct isp_prev_device *prev = &video->isp->isp_prev;
15781578

15791579
if (video->type == V4L2_BUF_TYPE_VIDEO_OUTPUT)
1580-
preview_set_inaddr(prev, buffer->isp_addr);
1580+
preview_set_inaddr(prev, buffer->dma);
15811581

15821582
if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
1583-
preview_set_outaddr(prev, buffer->isp_addr);
1583+
preview_set_outaddr(prev, buffer->dma);
15841584

15851585
return 0;
15861586
}

‎drivers/media/platform/omap3isp/ispresizer.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,7 +1040,7 @@ static void resizer_isr_buffer(struct isp_res_device *res)
10401040
*/
10411041
buffer = omap3isp_video_buffer_next(&res->video_out);
10421042
if (buffer != NULL) {
1043-
resizer_set_outaddr(res, buffer->isp_addr);
1043+
resizer_set_outaddr(res, buffer->dma);
10441044
restart = 1;
10451045
}
10461046

@@ -1049,7 +1049,7 @@ static void resizer_isr_buffer(struct isp_res_device *res)
10491049
if (res->input == RESIZER_INPUT_MEMORY) {
10501050
buffer = omap3isp_video_buffer_next(&res->video_in);
10511051
if (buffer != NULL)
1052-
resizer_set_inaddr(res, buffer->isp_addr);
1052+
resizer_set_inaddr(res, buffer->dma);
10531053
pipe->state |= ISP_PIPELINE_IDLE_INPUT;
10541054
}
10551055

@@ -1101,7 +1101,7 @@ static int resizer_video_queue(struct isp_video *video,
11011101
struct isp_res_device *res = &video->isp->isp_res;
11021102

11031103
if (video->type == V4L2_BUF_TYPE_VIDEO_OUTPUT)
1104-
resizer_set_inaddr(res, buffer->isp_addr);
1104+
resizer_set_inaddr(res, buffer->dma);
11051105

11061106
/*
11071107
* We now have a buffer queued on the output. Despite what the
@@ -1116,7 +1116,7 @@ static int resizer_video_queue(struct isp_video *video,
11161116
* continuous mode or when starting the stream.
11171117
*/
11181118
if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
1119-
resizer_set_outaddr(res, buffer->isp_addr);
1119+
resizer_set_outaddr(res, buffer->dma);
11201120

11211121
return 0;
11221122
}

‎drivers/media/platform/omap3isp/ispvideo.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ static int isp_video_buffer_prepare(struct vb2_buffer *buf)
374374
}
375375

376376
vb2_set_plane_payload(&buffer->vb, 0, vfh->format.fmt.pix.sizeimage);
377-
buffer->isp_addr = addr;
377+
buffer->dma = addr;
378378

379379
return 0;
380380
}

‎drivers/media/platform/omap3isp/ispvideo.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,12 @@ static inline int isp_pipeline_ready(struct isp_pipeline *pipe)
127127
* struct isp_buffer - ISP video buffer
128128
* @vb: videobuf2 buffer
129129
* @irqlist: List head for insertion into IRQ queue
130-
* @isp_addr: DMA address
130+
* @dma: DMA address
131131
*/
132132
struct isp_buffer {
133133
struct vb2_buffer vb;
134134
struct list_head irqlist;
135-
dma_addr_t isp_addr;
135+
dma_addr_t dma;
136136
};
137137

138138
#define to_isp_buffer(buf) container_of(buf, struct isp_buffer, vb)

0 commit comments

Comments
 (0)