diff mbox

[3/3,media] s5p-mfc: Use of_match_ptr and CONFIG_OF

Message ID 1356689908-6866-3-git-send-email-sachin.kamat@linaro.org (mailing list archive)
State New, archived
Headers show

Commit Message

Sachin Kamat Dec. 28, 2012, 10:18 a.m. UTC
This builds the code only if DT is enabled.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/media/platform/s5p-mfc/s5p_mfc.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

Comments

Sylwester Nawrocki Jan. 6, 2013, 2:48 p.m. UTC | #1
Hi Sachin,

On 12/28/2012 11:18 AM, Sachin Kamat wrote:
> This builds the code only if DT is enabled.

Since the driver this patch touches is for platforms that in (not distant)
future will be DT only I don't really see an advantage of applying it,
only to need to revert it after few kernel releases.

I realize this exynos_mfc_match[] array's size is ~400 B, but still I'd
prefer to avoid such #ifdefs.

> Signed-off-by: Sachin Kamat<sachin.kamat@linaro.org>
> ---
>   drivers/media/platform/s5p-mfc/s5p_mfc.c |    4 +++-
>   1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
> index 3930177..65ed603 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
> @@ -1405,6 +1405,7 @@ static struct platform_device_id mfc_driver_ids[] = {
>   };
>   MODULE_DEVICE_TABLE(platform, mfc_driver_ids);
>
> +#ifdef CONFIG_OF
>   static const struct of_device_id struct of_device_id[] = {
>   	{
>   		.compatible = "samsung,mfc-v5",
> @@ -1416,6 +1417,7 @@ static const struct of_device_id exynos_mfc_match[] = {
>   	{},
>   };
>   MODULE_DEVICE_TABLE(of, exynos_mfc_match);
> +#endif


>   static void *mfc_get_drv_data(struct platform_device *pdev)
>   {
> @@ -1442,7 +1444,7 @@ static struct platform_driver s5p_mfc_driver = {
>   		.name	= S5P_MFC_NAME,
>   		.owner	= THIS_MODULE,
>   		.pm	=&s5p_mfc_pm_ops,
> -		.of_match_table = exynos_mfc_match,
> +		.of_match_table = of_match_ptr(exynos_mfc_match),
>   	},
>   };
>

Thanks,
Sylwester
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
index 3930177..65ed603 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -1405,6 +1405,7 @@  static struct platform_device_id mfc_driver_ids[] = {
 };
 MODULE_DEVICE_TABLE(platform, mfc_driver_ids);
 
+#ifdef CONFIG_OF
 static const struct of_device_id exynos_mfc_match[] = {
 	{
 		.compatible = "samsung,mfc-v5",
@@ -1416,6 +1417,7 @@  static const struct of_device_id exynos_mfc_match[] = {
 	{},
 };
 MODULE_DEVICE_TABLE(of, exynos_mfc_match);
+#endif
 
 static void *mfc_get_drv_data(struct platform_device *pdev)
 {
@@ -1442,7 +1444,7 @@  static struct platform_driver s5p_mfc_driver = {
 		.name	= S5P_MFC_NAME,
 		.owner	= THIS_MODULE,
 		.pm	= &s5p_mfc_pm_ops,
-		.of_match_table = exynos_mfc_match,
+		.of_match_table = of_match_ptr(exynos_mfc_match),
 	},
 };