diff options
author | Alan Cox <alan@linux.intel.com> | 2017-03-10 11:33:45 +0000 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-12 14:48:20 +0100 |
commit | d9b16766fe2d50cbdeaf9c536312e1e5667a64a6 (patch) | |
tree | 495d19c554cce6002276101827922ddc97ab7b6f /drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr | |
parent | 5a0ff3683d68ec5c7898899ca3445ca6cb10c928 (diff) | |
download | op-kernel-dev-d9b16766fe2d50cbdeaf9c536312e1e5667a64a6.zip op-kernel-dev-d9b16766fe2d50cbdeaf9c536312e1e5667a64a6.tar.gz |
atomisp: remove unused code and unify a header
KLOCWORK is never defined so we can remove the workarounds for this in the
code.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr')
-rw-r--r-- | drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/src/rmgr_vbuf.c | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/src/rmgr_vbuf.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/src/rmgr_vbuf.c index dc30e7c..3aafc0a 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/src/rmgr_vbuf.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/src/rmgr_vbuf.c @@ -1,7 +1,6 @@ -#ifndef ISP2401 /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * Copyright (c) 2010-2015, Intel Corporation. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -12,21 +11,6 @@ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * more details. */ -#else -/** -Support for Intel Camera Imaging ISP subsystem. -Copyright (c) 2010 - 2015, Intel Corporation. - -This program is free software; you can redistribute it and/or modify it -under the terms and conditions of the GNU General Public License, -version 2, as published by the Free Software Foundation. - -This program is distributed in the hope it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. -*/ -#endif #include "ia_css_rmgr.h" @@ -279,21 +263,7 @@ void rmgr_pop_handle(struct ia_css_rmgr_vbuf_pool *pool, void ia_css_rmgr_acq_vbuf(struct ia_css_rmgr_vbuf_pool *pool, struct ia_css_rmgr_vbuf_handle **handle) { -#ifdef __KLOCWORK__ - /* KW sees the *handle = h; assignment about 20 lines down - and thinks that we are assigning a local to a global. - What it does not see is that in ia_css_i_host_rmgr_pop_handle - a new value is assigned to handle. - So this is a false positive KW issue. - To fix that we make the struct static for KW so it will - think that h remains alive; we do not want this in our - production code though as it breaks reentrancy of the code - */ - - static struct ia_css_rmgr_vbuf_handle h; -#else /* __KLOCWORK__ */ struct ia_css_rmgr_vbuf_handle h; -#endif /* __KLOCWORK__ */ if ((pool == NULL) || (handle == NULL) || (*handle == NULL)) { IA_CSS_LOG("Invalid inputs"); |