diff options
| author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2012-03-17 17:31:33 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-04-10 14:24:20 -0400 |
| commit | 6ec0163b7952ad087844338806402468fb06a32c (patch) | |
| tree | 66bdc56e245b864f1348704be4abad4d066035cb /drivers/media/video/s5p-fimc | |
| parent | 935b1892d81fbf1a4426ca5140ea3fd32dce1614 (diff) | |
[media] s5p-fimc: Remove unneeded fields from struct fimc_dev
irq is used only locally and num_clocks is constant, so remove them.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/s5p-fimc')
| -rw-r--r-- | drivers/media/video/s5p-fimc/fimc-core.c | 8 | ||||
| -rw-r--r-- | drivers/media/video/s5p-fimc/fimc-core.h | 4 |
2 files changed, 3 insertions, 9 deletions
diff --git a/drivers/media/video/s5p-fimc/fimc-core.c b/drivers/media/video/s5p-fimc/fimc-core.c index 21691e4ee55..4d6b8679118 100644 --- a/drivers/media/video/s5p-fimc/fimc-core.c +++ b/drivers/media/video/s5p-fimc/fimc-core.c | |||
| @@ -1559,7 +1559,7 @@ void fimc_unregister_m2m_device(struct fimc_dev *fimc) | |||
| 1559 | static void fimc_clk_put(struct fimc_dev *fimc) | 1559 | static void fimc_clk_put(struct fimc_dev *fimc) |
| 1560 | { | 1560 | { |
| 1561 | int i; | 1561 | int i; |
| 1562 | for (i = 0; i < fimc->num_clocks; i++) { | 1562 | for (i = 0; i < MAX_FIMC_CLOCKS; i++) { |
| 1563 | if (IS_ERR_OR_NULL(fimc->clock[i])) | 1563 | if (IS_ERR_OR_NULL(fimc->clock[i])) |
| 1564 | continue; | 1564 | continue; |
| 1565 | clk_unprepare(fimc->clock[i]); | 1565 | clk_unprepare(fimc->clock[i]); |
| @@ -1572,7 +1572,7 @@ static int fimc_clk_get(struct fimc_dev *fimc) | |||
| 1572 | { | 1572 | { |
| 1573 | int i, ret; | 1573 | int i, ret; |
| 1574 | 1574 | ||
| 1575 | for (i = 0; i < fimc->num_clocks; i++) { | 1575 | for (i = 0; i < MAX_FIMC_CLOCKS; i++) { |
| 1576 | fimc->clock[i] = clk_get(&fimc->pdev->dev, fimc_clocks[i]); | 1576 | fimc->clock[i] = clk_get(&fimc->pdev->dev, fimc_clocks[i]); |
| 1577 | if (IS_ERR(fimc->clock[i])) | 1577 | if (IS_ERR(fimc->clock[i])) |
| 1578 | goto err; | 1578 | goto err; |
| @@ -1672,9 +1672,7 @@ static int fimc_probe(struct platform_device *pdev) | |||
| 1672 | dev_err(&pdev->dev, "Failed to get IRQ resource\n"); | 1672 | dev_err(&pdev->dev, "Failed to get IRQ resource\n"); |
| 1673 | return -ENXIO; | 1673 | return -ENXIO; |
| 1674 | } | 1674 | } |
| 1675 | fimc->irq = res->start; | ||
| 1676 | 1675 | ||
| 1677 | fimc->num_clocks = MAX_FIMC_CLOCKS; | ||
| 1678 | ret = fimc_clk_get(fimc); | 1676 | ret = fimc_clk_get(fimc); |
| 1679 | if (ret) | 1677 | if (ret) |
| 1680 | return ret; | 1678 | return ret; |
| @@ -1683,7 +1681,7 @@ static int fimc_probe(struct platform_device *pdev) | |||
| 1683 | 1681 | ||
| 1684 | platform_set_drvdata(pdev, fimc); | 1682 | platform_set_drvdata(pdev, fimc); |
| 1685 | 1683 | ||
| 1686 | ret = devm_request_irq(&pdev->dev, fimc->irq, fimc_irq_handler, | 1684 | ret = devm_request_irq(&pdev->dev, res->start, fimc_irq_handler, |
| 1687 | 0, pdev->name, fimc); | 1685 | 0, pdev->name, fimc); |
| 1688 | if (ret) { | 1686 | if (ret) { |
| 1689 | dev_err(&pdev->dev, "failed to install irq (%d)\n", ret); | 1687 | dev_err(&pdev->dev, "failed to install irq (%d)\n", ret); |
diff --git a/drivers/media/video/s5p-fimc/fimc-core.h b/drivers/media/video/s5p-fimc/fimc-core.h index 101c930f08b..193e8f60394 100644 --- a/drivers/media/video/s5p-fimc/fimc-core.h +++ b/drivers/media/video/s5p-fimc/fimc-core.h | |||
| @@ -429,10 +429,8 @@ struct fimc_ctx; | |||
| 429 | * @pdata: pointer to the device platform data | 429 | * @pdata: pointer to the device platform data |
| 430 | * @variant: the IP variant information | 430 | * @variant: the IP variant information |
| 431 | * @id: FIMC device index (0..FIMC_MAX_DEVS) | 431 | * @id: FIMC device index (0..FIMC_MAX_DEVS) |
| 432 | * @num_clocks: the number of clocks managed by this device instance | ||
| 433 | * @clock: clocks required for FIMC operation | 432 | * @clock: clocks required for FIMC operation |
| 434 | * @regs: the mapped hardware registers | 433 | * @regs: the mapped hardware registers |
| 435 | * @irq: FIMC interrupt number | ||
| 436 | * @irq_queue: interrupt handler waitqueue | 434 | * @irq_queue: interrupt handler waitqueue |
| 437 | * @v4l2_dev: root v4l2_device | 435 | * @v4l2_dev: root v4l2_device |
| 438 | * @m2m: memory-to-memory V4L2 device information | 436 | * @m2m: memory-to-memory V4L2 device information |
| @@ -448,10 +446,8 @@ struct fimc_dev { | |||
| 448 | struct s5p_platform_fimc *pdata; | 446 | struct s5p_platform_fimc *pdata; |
| 449 | struct samsung_fimc_variant *variant; | 447 | struct samsung_fimc_variant *variant; |
| 450 | u16 id; | 448 | u16 id; |
| 451 | u16 num_clocks; | ||
| 452 | struct clk *clock[MAX_FIMC_CLOCKS]; | 449 | struct clk *clock[MAX_FIMC_CLOCKS]; |
| 453 | void __iomem *regs; | 450 | void __iomem *regs; |
| 454 | int irq; | ||
| 455 | wait_queue_head_t irq_queue; | 451 | wait_queue_head_t irq_queue; |
| 456 | struct v4l2_device *v4l2_dev; | 452 | struct v4l2_device *v4l2_dev; |
| 457 | struct fimc_m2m_device m2m; | 453 | struct fimc_m2m_device m2m; |