aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLad, Prabhakar <prabhakar.csengg@gmail.com>2014-02-21 07:07:21 -0500
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-03-05 15:00:23 -0500
commit25aeb418c6628787fb534b114cb47de76583a27c (patch)
treef39365d6ced0025d102b0d0e4c6540218f451e8d
parente72ed08e66d044ed74c485da68ca809bebf99739 (diff)
[media] omap3isp: Fix typos
Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r--drivers/media/platform/omap3isp/isp.c2
-rw-r--r--drivers/media/platform/omap3isp/ispccdc.c2
-rw-r--r--drivers/media/platform/omap3isp/ispccp2.c4
-rw-r--r--drivers/media/platform/omap3isp/isphist.c2
-rw-r--r--drivers/media/platform/omap3isp/isppreview.c4
-rw-r--r--drivers/media/platform/omap3isp/ispqueue.c2
-rw-r--r--drivers/media/platform/omap3isp/ispresizer.h4
-rw-r--r--drivers/media/platform/omap3isp/ispstat.c4
8 files changed, 12 insertions, 12 deletions
diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
index 5807185262fe..65a9b1dad0c3 100644
--- a/drivers/media/platform/omap3isp/isp.c
+++ b/drivers/media/platform/omap3isp/isp.c
@@ -391,7 +391,7 @@ static void isp_disable_interrupts(struct isp_device *isp)
391 * @isp: OMAP3 ISP device 391 * @isp: OMAP3 ISP device
392 * @idle: Consider idle state. 392 * @idle: Consider idle state.
393 * 393 *
394 * Set the power settings for the ISP and SBL bus and cConfigure the HS/VS 394 * Set the power settings for the ISP and SBL bus and configure the HS/VS
395 * interrupt source. 395 * interrupt source.
396 * 396 *
397 * We need to configure the HS/VS interrupt source before interrupts get 397 * We need to configure the HS/VS interrupt source before interrupts get
diff --git a/drivers/media/platform/omap3isp/ispccdc.c b/drivers/media/platform/omap3isp/ispccdc.c
index 5db2c88b9ad8..7160e4a4c14d 100644
--- a/drivers/media/platform/omap3isp/ispccdc.c
+++ b/drivers/media/platform/omap3isp/ispccdc.c
@@ -293,7 +293,7 @@ static int __ccdc_lsc_enable(struct isp_ccdc_device *ccdc, int enable)
293 isp_reg_clr(isp, OMAP3_ISP_IOMEM_CCDC, 293 isp_reg_clr(isp, OMAP3_ISP_IOMEM_CCDC,
294 ISPCCDC_LSC_CONFIG, ISPCCDC_LSC_ENABLE); 294 ISPCCDC_LSC_CONFIG, ISPCCDC_LSC_ENABLE);
295 ccdc->lsc.state = LSC_STATE_STOPPED; 295 ccdc->lsc.state = LSC_STATE_STOPPED;
296 dev_warn(to_device(ccdc), "LSC prefecth timeout\n"); 296 dev_warn(to_device(ccdc), "LSC prefetch timeout\n");
297 return -ETIMEDOUT; 297 return -ETIMEDOUT;
298 } 298 }
299 ccdc->lsc.state = LSC_STATE_RUNNING; 299 ccdc->lsc.state = LSC_STATE_RUNNING;
diff --git a/drivers/media/platform/omap3isp/ispccp2.c b/drivers/media/platform/omap3isp/ispccp2.c
index e84fe0543e47..c81ca8faa8cb 100644
--- a/drivers/media/platform/omap3isp/ispccp2.c
+++ b/drivers/media/platform/omap3isp/ispccp2.c
@@ -518,7 +518,7 @@ static void ccp2_mem_configure(struct isp_ccp2_device *ccp2,
518 ISPCCP2_LCM_IRQSTATUS_EOF_IRQ, 518 ISPCCP2_LCM_IRQSTATUS_EOF_IRQ,
519 OMAP3_ISP_IOMEM_CCP2, ISPCCP2_LCM_IRQSTATUS); 519 OMAP3_ISP_IOMEM_CCP2, ISPCCP2_LCM_IRQSTATUS);
520 520
521 /* Enable LCM interupts */ 521 /* Enable LCM interrupts */
522 isp_reg_set(isp, OMAP3_ISP_IOMEM_CCP2, ISPCCP2_LCM_IRQENABLE, 522 isp_reg_set(isp, OMAP3_ISP_IOMEM_CCP2, ISPCCP2_LCM_IRQENABLE,
523 ISPCCP2_LCM_IRQSTATUS_EOF_IRQ | 523 ISPCCP2_LCM_IRQSTATUS_EOF_IRQ |
524 ISPCCP2_LCM_IRQSTATUS_OCPERROR_IRQ); 524 ISPCCP2_LCM_IRQSTATUS_OCPERROR_IRQ);
@@ -1096,7 +1096,7 @@ static int ccp2_init_entities(struct isp_ccp2_device *ccp2)
1096 * implementation we use a fixed 32 bytes alignment regardless of the 1096 * implementation we use a fixed 32 bytes alignment regardless of the
1097 * input format and width. If strict 128 bits alignment support is 1097 * input format and width. If strict 128 bits alignment support is
1098 * required ispvideo will need to be made aware of this special dual 1098 * required ispvideo will need to be made aware of this special dual
1099 * alignement requirements. 1099 * alignment requirements.
1100 */ 1100 */
1101 ccp2->video_in.type = V4L2_BUF_TYPE_VIDEO_OUTPUT; 1101 ccp2->video_in.type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
1102 ccp2->video_in.bpl_alignment = 32; 1102 ccp2->video_in.bpl_alignment = 32;
diff --git a/drivers/media/platform/omap3isp/isphist.c b/drivers/media/platform/omap3isp/isphist.c
index e070c24048ef..6db6cfbd8f3b 100644
--- a/drivers/media/platform/omap3isp/isphist.c
+++ b/drivers/media/platform/omap3isp/isphist.c
@@ -351,7 +351,7 @@ static int hist_validate_params(struct ispstat *hist, void *new_conf)
351 351
352 buf_size = hist_get_buf_size(user_cfg); 352 buf_size = hist_get_buf_size(user_cfg);
353 if (buf_size > user_cfg->buf_size) 353 if (buf_size > user_cfg->buf_size)
354 /* User's buf_size request wasn't enoght */ 354 /* User's buf_size request wasn't enough */
355 user_cfg->buf_size = buf_size; 355 user_cfg->buf_size = buf_size;
356 else if (user_cfg->buf_size > OMAP3ISP_HIST_MAX_BUF_SIZE) 356 else if (user_cfg->buf_size > OMAP3ISP_HIST_MAX_BUF_SIZE)
357 user_cfg->buf_size = OMAP3ISP_HIST_MAX_BUF_SIZE; 357 user_cfg->buf_size = OMAP3ISP_HIST_MAX_BUF_SIZE;
diff --git a/drivers/media/platform/omap3isp/isppreview.c b/drivers/media/platform/omap3isp/isppreview.c
index 1dbff1472809..fe91a3b7d84f 100644
--- a/drivers/media/platform/omap3isp/isppreview.c
+++ b/drivers/media/platform/omap3isp/isppreview.c
@@ -122,7 +122,7 @@ static struct omap3isp_prev_csc flr_prev_csc = {
122#define PREV_MAX_OUT_WIDTH_REV_15 4096 122#define PREV_MAX_OUT_WIDTH_REV_15 4096
123 123
124/* 124/*
125 * Coeficient Tables for the submodules in Preview. 125 * Coefficient Tables for the submodules in Preview.
126 * Array is initialised with the values from.the tables text file. 126 * Array is initialised with the values from.the tables text file.
127 */ 127 */
128 128
@@ -1372,7 +1372,7 @@ static void preview_init_params(struct isp_prev_device *prev)
1372} 1372}
1373 1373
1374/* 1374/*
1375 * preview_max_out_width - Handle previewer hardware ouput limitations 1375 * preview_max_out_width - Handle previewer hardware output limitations
1376 * @isp_revision : ISP revision 1376 * @isp_revision : ISP revision
1377 * returns maximum width output for current isp revision 1377 * returns maximum width output for current isp revision
1378 */ 1378 */
diff --git a/drivers/media/platform/omap3isp/ispqueue.c b/drivers/media/platform/omap3isp/ispqueue.c
index 5f0f8fab1d17..a5e65858e799 100644
--- a/drivers/media/platform/omap3isp/ispqueue.c
+++ b/drivers/media/platform/omap3isp/ispqueue.c
@@ -597,7 +597,7 @@ static int isp_video_buffer_wait(struct isp_video_buffer *buf, int nonblocking)
597 * isp_video_queue_free - Free video buffers memory 597 * isp_video_queue_free - Free video buffers memory
598 * 598 *
599 * Buffers can only be freed if the queue isn't streaming and if no buffer is 599 * Buffers can only be freed if the queue isn't streaming and if no buffer is
600 * mapped to userspace. Return -EBUSY if those conditions aren't statisfied. 600 * mapped to userspace. Return -EBUSY if those conditions aren't satisfied.
601 * 601 *
602 * This function must be called with the queue lock held. 602 * This function must be called with the queue lock held.
603 */ 603 */
diff --git a/drivers/media/platform/omap3isp/ispresizer.h b/drivers/media/platform/omap3isp/ispresizer.h
index 70c1c0e1bbdf..9b01e9047c15 100644
--- a/drivers/media/platform/omap3isp/ispresizer.h
+++ b/drivers/media/platform/omap3isp/ispresizer.h
@@ -30,12 +30,12 @@
30#include <linux/types.h> 30#include <linux/types.h>
31 31
32/* 32/*
33 * Constants for filter coefficents count 33 * Constants for filter coefficients count
34 */ 34 */
35#define COEFF_CNT 32 35#define COEFF_CNT 32
36 36
37/* 37/*
38 * struct isprsz_coef - Structure for resizer filter coeffcients. 38 * struct isprsz_coef - Structure for resizer filter coefficients.
39 * @h_filter_coef_4tap: Horizontal filter coefficients for 8-phase/4-tap 39 * @h_filter_coef_4tap: Horizontal filter coefficients for 8-phase/4-tap
40 * mode (.5x-4x) 40 * mode (.5x-4x)
41 * @v_filter_coef_4tap: Vertical filter coefficients for 8-phase/4-tap 41 * @v_filter_coef_4tap: Vertical filter coefficients for 8-phase/4-tap
diff --git a/drivers/media/platform/omap3isp/ispstat.c b/drivers/media/platform/omap3isp/ispstat.c
index a75407c3a726..5707f85c4cc4 100644
--- a/drivers/media/platform/omap3isp/ispstat.c
+++ b/drivers/media/platform/omap3isp/ispstat.c
@@ -144,7 +144,7 @@ static int isp_stat_buf_check_magic(struct ispstat *stat,
144 for (w = buf->virt_addr + buf_size, end = w + MAGIC_SIZE; 144 for (w = buf->virt_addr + buf_size, end = w + MAGIC_SIZE;
145 w < end; w++) { 145 w < end; w++) {
146 if (unlikely(*w != MAGIC_NUM)) { 146 if (unlikely(*w != MAGIC_NUM)) {
147 dev_dbg(stat->isp->dev, "%s: endding magic check does " 147 dev_dbg(stat->isp->dev, "%s: ending magic check does "
148 "not match.\n", stat->subdev.name); 148 "not match.\n", stat->subdev.name);
149 return -EINVAL; 149 return -EINVAL;
150 } 150 }
@@ -841,7 +841,7 @@ int omap3isp_stat_s_stream(struct v4l2_subdev *subdev, int enable)
841 if (enable) { 841 if (enable) {
842 /* 842 /*
843 * Only set enable PCR bit if the module was previously 843 * Only set enable PCR bit if the module was previously
844 * enabled through ioct. 844 * enabled through ioctl.
845 */ 845 */
846 isp_stat_try_enable(stat); 846 isp_stat_try_enable(stat);
847 } else { 847 } else {