lkml.org 
[lkml]   [2010]   [Nov]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 13/17] staging/vme_user: remove __iomem marking from kern_buf and derivates
    From
    Date
    From: Emilio G. Cota <cota@braap.org>

    kern_buf is not iomem; it comes from kmalloc and is directly
    dereferenced.

    Signed-off-by: Emilio G. Cota <cota@braap.org>
    Acked-by: Martyn Welch <martyn.welch@ge.com>
    ---

    drivers/staging/vme/devices/vme_user.c | 6 +++---
    1 files changed, 3 insertions(+), 3 deletions(-)


    diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c
    index 7c61adc..5d3a39b 100644
    --- a/drivers/staging/vme/devices/vme_user.c
    +++ b/drivers/staging/vme/devices/vme_user.c
    @@ -92,7 +92,7 @@ static unsigned int bus_num;
    * Structure to handle image related parameters.
    */
    typedef struct {
    - void __iomem *kern_buf; /* Buffer address in kernel space */
    + void *kern_buf; /* Buffer address in kernel space */
    dma_addr_t pci_buf; /* Buffer address in PCI address space */
    unsigned long long size_buf; /* Buffer size */
    struct semaphore sem; /* Semaphore for locking image */
    @@ -277,7 +277,7 @@ static ssize_t resource_from_user(unsigned int minor, const char *buf,
    static ssize_t buffer_to_user(unsigned int minor, char __user *buf,
    size_t count, loff_t *ppos)
    {
    - void __iomem *image_ptr;
    + void *image_ptr;
    ssize_t retval;

    image_ptr = image[minor].kern_buf + *ppos;
    @@ -296,7 +296,7 @@ static ssize_t buffer_to_user(unsigned int minor, char __user *buf,
    static ssize_t buffer_from_user(unsigned int minor, const char *buf,
    size_t count, loff_t *ppos)
    {
    - void __iomem *image_ptr;
    + void *image_ptr;
    size_t retval;

    image_ptr = image[minor].kern_buf + *ppos;

    --
    Martyn Welch (Principal Software Engineer) | Registered in England and
    GE Intelligent Platforms | Wales (3828642) at 100
    T +44(0)127322748 | Barbirolli Square, Manchester,
    E martyn.welch@ge.com | M2 3AB VAT:GB 927559189

    \
     
     \ /
      Last update: 2010-11-12 12:19    [W:3.259 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site