diff options
| author | Alan Cox <alan@linux.intel.com> | 2011-03-30 23:43:16 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-04 21:38:34 -0700 |
| commit | 00838d4f507ae73f2b5a260c826f6275bd2d4ba7 (patch) | |
| tree | 53bfabbe0700425da86551077be2c06f8e7cff06 /drivers/staging | |
| parent | a58c616a9525a7094e950a64ec9232905a2858b5 (diff) | |
| download | linux-00838d4f507ae73f2b5a260c826f6275bd2d4ba7.tar.gz linux-00838d4f507ae73f2b5a260c826f6275bd2d4ba7.tar.bz2 linux-00838d4f507ae73f2b5a260c826f6275bd2d4ba7.zip | |
staging: sep: remove last memrar remnants
So we can drop the memrar staging driver
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/sep/sep_driver.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/staging/sep/sep_driver.c b/drivers/staging/sep/sep_driver.c index 71a5fbc041e4..7009fd8b79f2 100644 --- a/drivers/staging/sep/sep_driver.c +++ b/drivers/staging/sep/sep_driver.c @@ -55,8 +55,6 @@ #include <linux/jiffies.h> #include <linux/rar_register.h> -#include "../memrar/memrar.h" - #include "sep_driver_hw_defs.h" #include "sep_driver_config.h" #include "sep_driver_api.h" @@ -2372,7 +2370,6 @@ static int sep_rar_prepare_output_msg_handler(struct sep_device *sep, int error = 0; /* Command args */ struct rar_hndl_to_bus_struct command_args; - struct RAR_buffer rar_buf; /* Bus address */ dma_addr_t rar_bus = 0; /* Holds the RAR address in the system memory offset */ @@ -2386,16 +2383,8 @@ static int sep_rar_prepare_output_msg_handler(struct sep_device *sep, } /* Call to translation function only if user handle is not NULL */ - if (command_args.rar_handle) { - memset(&rar_buf, 0, sizeof(rar_buf)); - rar_buf.info.handle = (u32)command_args.rar_handle; - - if (rar_handle_to_bus(&rar_buf, 1) != 1) { - error = -EFAULT; - goto end_function; - } - rar_bus = rar_buf.bus_address; - } + if (command_args.rar_handle) + return -EOPNOTSUPP; dev_dbg(&sep->pdev->dev, "rar msg; rar_addr_bus = %x\n", (u32)rar_bus); /* Set value in the SYSTEM MEMORY offset */ |