Staging: comedi: remove wrapper.h

Just make the bit call when it is needed, no need to wrap
things up like this for no reason.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index 4b69d06ca7356873104a769fb9d8865374186565..800106ae9901ff9868f51e6631802c09e2278038 100644 (file)
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@ -38,7 +38,6 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include "comedidev.h"
-#include "wrapper.h"
 #include <linux/highmem.h>     /* for SuSE brokenness */
 #include <linux/vmalloc.h>
 #include <linux/cdev.h>
@@ -442,9 +441,7 @@ int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s,
                unsigned i;
                for (i = 0; i < async->n_buf_pages; ++i) {
                        if (async->buf_page_list[i].virt_addr) {
-                               mem_map_unreserve(virt_to_page
-                                                 (async->buf_page_list[i].
-                                                  virt_addr));
+                               clear_bit(PG_reserved, &(virt_to_page(async->buf_page_list[i].virt_addr)->flags));
                                if (s->async_dma_dir != DMA_NONE) {
                                        dma_free_coherent(dev->hw_dev,
                                                          PAGE_SIZE,
@@ -497,12 +494,9 @@ int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s,
                                if (async->buf_page_list[i].virt_addr == NULL)
                                        break;
 
-                               mem_map_reserve(virt_to_page
-                                               (async->buf_page_list[i].
-                                                virt_addr));
-                               pages[i] =
-                                   virt_to_page(async->
-                                                buf_page_list[i].virt_addr);
+                               set_bit(PG_reserved,
+                                       &(virt_to_page(async->buf_page_list[i].virt_addr)->flags));
+                               pages[i] = virt_to_page(async->buf_page_list[i].virt_addr);
                        }
                }
                if (i == n_pages) {
@@ -519,9 +513,7 @@ int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s,
                                            NULL) {
                                                break;
                                        }
-                                       mem_map_unreserve(virt_to_page
-                                                         (async->buf_page_list
-                                                          [i].virt_addr));
+                                       clear_bit(PG_reserved, &(virt_to_page(async->buf_page_list[i].virt_addr)->flags));
                                        if (s->async_dma_dir != DMA_NONE) {
                                                dma_free_coherent(dev->hw_dev,
                                                                  PAGE_SIZE,

diff --git a/drivers/staging/comedi/wrapper.h b/drivers/staging/comedi/wrapper.h
deleted file mode 100644 (file)
index 77fc673..0000000
--- a/drivers/staging/comedi/wrapper.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-    linux/wrapper.h compatibility header
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that 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.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef __COMPAT_LINUX_WRAPPER_H_
-#define __COMPAT_LINUX_WRAPPER_H_
-
-#define mem_map_reserve(p)      set_bit(PG_reserved, &((p)->flags))
-#define mem_map_unreserve(p)    clear_bit(PG_reserved, &((p)->flags))
-
-#endif /* __COMPAT_LINUX_WRAPPER_H_ */