Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / drivers / staging / sep / sep_driver.c

diff --git a/drivers/staging/sep/sep_driver.c b/drivers/staging/sep/sep_driver.c
index 09346c92e94dbae43f27f03ccf66fad28e8288e6..88880734921a8a8a1dd8ea7a50354bf255e41bab 100644 (file)
--- a/drivers/staging/sep/sep_driver.c
+++ b/drivers/staging/sep/sep_driver.c
@@ -42,6 +42,7 @@
 #include <linux/sched.h>
 #include <linux/pci.h>
 #include <linux/firmware.h>
+#include <linux/slab.h>
 #include <asm/ioctl.h>
 #include <linux/ioport.h>
 #include <asm/io.h>
@@ -183,8 +184,8 @@ static DECLARE_WAIT_QUEUE_HEAD(sep_event);
 static int sep_load_firmware(struct sep_device *sep)
 {
        const struct firmware *fw;
-       char *cache_name = "cache.image.bin";
-       char *res_name = "resident.image.bin";
+       char *cache_name = "sep/cache.image.bin";
+       char *res_name = "sep/resident.image.bin";
        int error;
 
        edbg("SEP Driver:rar_virtual is %p\n", sep->rar_addr);
@@ -223,6 +224,9 @@ static int sep_load_firmware(struct sep_device *sep)
        return 0;
 }
 
+MODULE_FIRMWARE("sep/cache.image.bin");
+MODULE_FIRMWARE("sep/resident.image.bin");
+
 /**
  *     sep_map_and_alloc_shared_area   -       allocate shared block
  *     @sep: security processor
@@ -381,8 +385,7 @@ static int sep_mmap(struct file *filp, struct vm_area_struct *vma)
           shared area */
        if ((vma->vm_end - vma->vm_start) > SEP_DRIVER_MMMAP_AREA_SIZE) {
                edbg("SEP Driver mmap requested size is more than allowed\n");
-               printk(KERN_WARNING "SEP Driver mmap requested size is more \
-                       than allowed\n");
+               printk(KERN_WARNING "SEP Driver mmap requested size is more than allowed\n");
                printk(KERN_WARNING "SEP Driver vma->vm_end is %08lx\n", vma->vm_end);
                printk(KERN_WARNING "SEP Driver vma->vm_end is %08lx\n", vma->vm_start);
                return -EAGAIN;
@@ -942,8 +945,9 @@ static int sep_lock_user_pages(struct sep_device *sep,
                        dbg("data_size is %lu\n", data_size);
                        while (1);
                }
-               edbg("lli_array[%lu].physical_address is %08lx, \
-               lli_array[%lu].block_size is %lu\n", count, lli_array[count].physical_address, count, lli_array[count].block_size);
+               edbg("lli_array[%lu].physical_address is %08lx, lli_array[%lu].block_size is %lu\n",
+                    count, lli_array[count].physical_address,
+                    count, lli_array[count].block_size);
        }
 
        /* set output params */