* [PATCH] media: v4l: use WARN_ON(1) instead of __WARN()
@ 2017-07-25 15:39 Arnd Bergmann
2017-07-25 22:58 ` Sakari Ailus
2017-07-26 11:24 ` Pavel Machek
0 siblings, 2 replies; 3+ messages in thread
From: Arnd Bergmann @ 2017-07-25 15:39 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Guennadi Liakhovetski, Sakari Ailus
Cc: Arnd Bergmann, Hans Verkuil, Robert Jarzmik, Petr Cvek,
Pavel Machek, Sebastian Reichel, linux-media, linux-kernel
__WARN() cannot be used in portable code, since it is only
available on some architectures and configurations:
drivers/media/platform/pxa_camera.c: In function 'pxa_mbus_config_compatible':
drivers/media/platform/pxa_camera.c:642:3: error: implicit declaration of function '__WARN'; did you mean '__WALL'? [-Werror=implicit-function-declaration]
The common way to express an unconditional warning is WARN_ON(1),
so let's use that here.
Fixes: 97bbdf02d905 ("media: v4l: Add support for CSI-1 and CCP2 busses")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/media/platform/pxa_camera.c | 2 +-
drivers/media/platform/soc_camera/soc_mediabus.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/pxa_camera.c b/drivers/media/platform/pxa_camera.c
index 3898a5cd8664..0d4af6d91ffc 100644
--- a/drivers/media/platform/pxa_camera.c
+++ b/drivers/media/platform/pxa_camera.c
@@ -639,7 +639,7 @@ static unsigned int pxa_mbus_config_compatible(const struct v4l2_mbus_config *cf
V4L2_MBUS_CSI2_CONTINUOUS_CLOCK);
return (!mipi_lanes || !mipi_clock) ? 0 : common_flags;
default:
- __WARN();
+ WARN_ON(1);
return -EINVAL;
}
return 0;
diff --git a/drivers/media/platform/soc_camera/soc_mediabus.c b/drivers/media/platform/soc_camera/soc_mediabus.c
index 43192d80beef..0ad4b28266e4 100644
--- a/drivers/media/platform/soc_camera/soc_mediabus.c
+++ b/drivers/media/platform/soc_camera/soc_mediabus.c
@@ -509,7 +509,7 @@ unsigned int soc_mbus_config_compatible(const struct v4l2_mbus_config *cfg,
V4L2_MBUS_CSI2_CONTINUOUS_CLOCK);
return (!mipi_lanes || !mipi_clock) ? 0 : common_flags;
default:
- __WARN();
+ WARN_ON(1);
return -EINVAL;
}
return 0;
--
2.9.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] media: v4l: use WARN_ON(1) instead of __WARN()
2017-07-25 15:39 [PATCH] media: v4l: use WARN_ON(1) instead of __WARN() Arnd Bergmann
@ 2017-07-25 22:58 ` Sakari Ailus
2017-07-26 11:24 ` Pavel Machek
1 sibling, 0 replies; 3+ messages in thread
From: Sakari Ailus @ 2017-07-25 22:58 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Mauro Carvalho Chehab, Guennadi Liakhovetski, Hans Verkuil,
Robert Jarzmik, Petr Cvek, Pavel Machek, Sebastian Reichel,
linux-media, linux-kernel
On Tue, Jul 25, 2017 at 05:39:14PM +0200, Arnd Bergmann wrote:
> __WARN() cannot be used in portable code, since it is only
> available on some architectures and configurations:
>
> drivers/media/platform/pxa_camera.c: In function 'pxa_mbus_config_compatible':
> drivers/media/platform/pxa_camera.c:642:3: error: implicit declaration of function '__WARN'; did you mean '__WALL'? [-Werror=implicit-function-declaration]
>
> The common way to express an unconditional warning is WARN_ON(1),
> so let's use that here.
>
> Fixes: 97bbdf02d905 ("media: v4l: Add support for CSI-1 and CCP2 busses")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/media/platform/pxa_camera.c | 2 +-
> drivers/media/platform/soc_camera/soc_mediabus.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/platform/pxa_camera.c b/drivers/media/platform/pxa_camera.c
> index 3898a5cd8664..0d4af6d91ffc 100644
> --- a/drivers/media/platform/pxa_camera.c
> +++ b/drivers/media/platform/pxa_camera.c
> @@ -639,7 +639,7 @@ static unsigned int pxa_mbus_config_compatible(const struct v4l2_mbus_config *cf
> V4L2_MBUS_CSI2_CONTINUOUS_CLOCK);
> return (!mipi_lanes || !mipi_clock) ? 0 : common_flags;
> default:
> - __WARN();
> + WARN_ON(1);
> return -EINVAL;
> }
> return 0;
> diff --git a/drivers/media/platform/soc_camera/soc_mediabus.c b/drivers/media/platform/soc_camera/soc_mediabus.c
> index 43192d80beef..0ad4b28266e4 100644
> --- a/drivers/media/platform/soc_camera/soc_mediabus.c
> +++ b/drivers/media/platform/soc_camera/soc_mediabus.c
> @@ -509,7 +509,7 @@ unsigned int soc_mbus_config_compatible(const struct v4l2_mbus_config *cfg,
> V4L2_MBUS_CSI2_CONTINUOUS_CLOCK);
> return (!mipi_lanes || !mipi_clock) ? 0 : common_flags;
> default:
> - __WARN();
> + WARN_ON(1);
> return -EINVAL;
> }
> return 0;
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
--
Sakari Ailus
e-mail: sakari.ailus@iki.fi XMPP: sailus@retiisi.org.uk
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] media: v4l: use WARN_ON(1) instead of __WARN()
2017-07-25 15:39 [PATCH] media: v4l: use WARN_ON(1) instead of __WARN() Arnd Bergmann
2017-07-25 22:58 ` Sakari Ailus
@ 2017-07-26 11:24 ` Pavel Machek
1 sibling, 0 replies; 3+ messages in thread
From: Pavel Machek @ 2017-07-26 11:24 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Mauro Carvalho Chehab, Guennadi Liakhovetski, Sakari Ailus,
Hans Verkuil, Robert Jarzmik, Petr Cvek, Sebastian Reichel,
linux-media, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 823 bytes --]
On Tue 2017-07-25 17:39:14, Arnd Bergmann wrote:
> __WARN() cannot be used in portable code, since it is only
> available on some architectures and configurations:
>
> drivers/media/platform/pxa_camera.c: In function 'pxa_mbus_config_compatible':
> drivers/media/platform/pxa_camera.c:642:3: error: implicit declaration of function '__WARN'; did you mean '__WALL'? [-Werror=implicit-function-declaration]
>
> The common way to express an unconditional warning is WARN_ON(1),
> so let's use that here.
>
> Fixes: 97bbdf02d905 ("media: v4l: Add support for CSI-1 and CCP2 busses")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Pavel Machek <pavel@ucw.cz>
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-07-26 11:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-25 15:39 [PATCH] media: v4l: use WARN_ON(1) instead of __WARN() Arnd Bergmann
2017-07-25 22:58 ` Sakari Ailus
2017-07-26 11:24 ` Pavel Machek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).