| Message ID | 20170725154001.294864-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | f57cdbd34cb435ed3b7d38be6276f7f389e8d0e9 |
| Headers | show |
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
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
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;
__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(-) -- 2.9.0