| Message ID | 20170708004102.GA27161@amitoj-Inspiron-3542 (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, 2017-07-07 at 20:41 -0400, Amitoj Kaur Chawla wrote: [...] > --- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c > +++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c > @@ -117,11 +117,7 @@ void *atomisp_kernel_zalloc(size_t bytes, bool > zero_mem) > */ > void atomisp_kernel_free(void *ptr) > { > - /* Verify if buffer was allocated by vmalloc() or kmalloc() > */ > - if (is_vmalloc_addr(ptr)) > - vfree(ptr); > - else > - kfree(ptr); > + kvfree(ptr); > } > > /* Why not get rid of the trivial wrapper function completely? MfG, Bernd
On Sat, Jul 8, 2017 at 4:58 AM, Bernd Petrovitsch <bernd@petrovitsch.priv.at> wrote: > On Fri, 2017-07-07 at 20:41 -0400, Amitoj Kaur Chawla wrote: > [...] >> --- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c >> +++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c >> @@ -117,11 +117,7 @@ void *atomisp_kernel_zalloc(size_t bytes, bool >> zero_mem) >> */ >> void atomisp_kernel_free(void *ptr) >> { >> - /* Verify if buffer was allocated by vmalloc() or kmalloc() >> */ >> - if (is_vmalloc_addr(ptr)) >> - vfree(ptr); >> - else >> - kfree(ptr); >> + kvfree(ptr); >> } >> >> /* > > Why not get rid of the trivial wrapper function completely? > Oh yes, i'll send a v2. Amitoj
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c index 97093ba..a156dd424 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c @@ -117,11 +117,7 @@ void *atomisp_kernel_zalloc(size_t bytes, bool zero_mem) */ void atomisp_kernel_free(void *ptr) { - /* Verify if buffer was allocated by vmalloc() or kmalloc() */ - if (is_vmalloc_addr(ptr)) - vfree(ptr); - else - kfree(ptr); + kvfree(ptr); } /*
Conditionally calling kfree()/vfree() can be replaced by a call to kvfree() which handles both kmalloced memory and vmalloced memory. Consequently removed an unnecessary comment. The Coccinelle semantic patch used to make the change is as follows: //<smpl> @@ expression a; @@ - if(...) { vfree(a); } - else { kfree(a); } + kvfree(a); @@ expression a; @@ - if(...) { kfree(a); } - else { vfree(a); } + kvfree(a); // </smpl> Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com> --- drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)