diff options
author | Alan Cox <alan@linux.intel.com> | 2011-03-30 18:43:16 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-05 00:38:34 -0400 |
commit | 00838d4f507ae73f2b5a260c826f6275bd2d4ba7 (patch) | |
tree | 53bfabbe0700425da86551077be2c06f8e7cff06 /drivers/staging | |
parent | a58c616a9525a7094e950a64ec9232905a2858b5 (diff) |
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 @@ | |||
55 | #include <linux/jiffies.h> | 55 | #include <linux/jiffies.h> |
56 | #include <linux/rar_register.h> | 56 | #include <linux/rar_register.h> |
57 | 57 | ||
58 | #include "../memrar/memrar.h" | ||
59 | |||
60 | #include "sep_driver_hw_defs.h" | 58 | #include "sep_driver_hw_defs.h" |
61 | #include "sep_driver_config.h" | 59 | #include "sep_driver_config.h" |
62 | #include "sep_driver_api.h" | 60 | #include "sep_driver_api.h" |
@@ -2372,7 +2370,6 @@ static int sep_rar_prepare_output_msg_handler(struct sep_device *sep, | |||
2372 | int error = 0; | 2370 | int error = 0; |
2373 | /* Command args */ | 2371 | /* Command args */ |
2374 | struct rar_hndl_to_bus_struct command_args; | 2372 | struct rar_hndl_to_bus_struct command_args; |
2375 | struct RAR_buffer rar_buf; | ||
2376 | /* Bus address */ | 2373 | /* Bus address */ |
2377 | dma_addr_t rar_bus = 0; | 2374 | dma_addr_t rar_bus = 0; |
2378 | /* Holds the RAR address in the system memory offset */ | 2375 | /* 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, | |||
2386 | } | 2383 | } |
2387 | 2384 | ||
2388 | /* Call to translation function only if user handle is not NULL */ | 2385 | /* Call to translation function only if user handle is not NULL */ |
2389 | if (command_args.rar_handle) { | 2386 | if (command_args.rar_handle) |
2390 | memset(&rar_buf, 0, sizeof(rar_buf)); | 2387 | return -EOPNOTSUPP; |
2391 | rar_buf.info.handle = (u32)command_args.rar_handle; | ||
2392 | |||
2393 | if (rar_handle_to_bus(&rar_buf, 1) != 1) { | ||
2394 | error = -EFAULT; | ||
2395 | goto end_function; | ||
2396 | } | ||
2397 | rar_bus = rar_buf.bus_address; | ||
2398 | } | ||
2399 | dev_dbg(&sep->pdev->dev, "rar msg; rar_addr_bus = %x\n", (u32)rar_bus); | 2388 | dev_dbg(&sep->pdev->dev, "rar msg; rar_addr_bus = %x\n", (u32)rar_bus); |
2400 | 2389 | ||
2401 | /* Set value in the SYSTEM MEMORY offset */ | 2390 | /* Set value in the SYSTEM MEMORY offset */ |