Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging "sep" Fix typos found while reading.

Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Justin P. Mattock and committed by
Greg Kroah-Hartman
e3499514 7a2ea600

+33 -33
+9 -9
drivers/staging/sep/sep_crypto.c
··· 807 807 * @size: size of parameter to copy (in bytes) 808 808 * @max_size: size to move up offset; SEP mesg is in word sizes 809 809 * @msg_offset: pointer to current offset (is updated) 810 - * @byte_array: flag ti indicate wheter endian must be changed 810 + * @byte_array: flag ti indicate whether endian must be changed 811 811 * Copies data into the message area from caller 812 812 */ 813 813 static void sep_write_msg(struct this_task_ctx *ta_ctx, void *in_addr, ··· 855 855 * @size: size of parameter to copy (in bytes) 856 856 * @max_size: size to move up offset; SEP mesg is in word sizes 857 857 * @msg_offset: pointer to current offset (is updated) 858 - * @byte_array: flag ti indicate wheter endian must be changed 858 + * @byte_array: flag ti indicate whether endian must be changed 859 859 * Copies data out of the message area to caller 860 860 */ 861 861 static void sep_read_msg(struct this_task_ctx *ta_ctx, void *in_addr, ··· 990 990 /** 991 991 * The following unlocks the sep and makes it available 992 992 * to any other application 993 - * First, null out crypto entries in sep before relesing it 993 + * First, null out crypto entries in sep before releasing it 994 994 */ 995 995 ta_ctx->sep_used->current_hash_req = NULL; 996 996 ta_ctx->sep_used->current_cypher_req = NULL; ··· 1001 1001 1002 1002 ta_ctx->call_status.status = 0; 1003 1003 1004 - /* Remove anything confidentail */ 1004 + /* Remove anything confidential */ 1005 1005 memset(ta_ctx->sep_used->shared_addr, 0, 1006 1006 SEP_DRIVER_MESSAGE_SHARED_AREA_SIZE_IN_BYTES); 1007 1007 ··· 1207 1207 req->nbytes, ta_ctx->walk.blocksize, &new_sg, 1); 1208 1208 1209 1209 if (int_error < 0) { 1210 - dev_warn(&ta_ctx->sep_used->pdev->dev, "oddball page eerror\n"); 1210 + dev_warn(&ta_ctx->sep_used->pdev->dev, "oddball page error\n"); 1211 1211 return -ENOMEM; 1212 1212 } else if (int_error == 1) { 1213 1213 ta_ctx->src_sg = new_sg; ··· 1870 1870 sizeof(struct sep_hash_private_context)); 1871 1871 1872 1872 /** 1873 - * Following is only for finup; if we just completd the 1873 + * Following is only for finup; if we just completed the 1874 1874 * data portion of finup, we now need to kick off the 1875 1875 * finish portion of finup. 1876 1876 */ ··· 2011 2011 } 2012 2012 2013 2013 /** 2014 - * The sep_finish function is the function that is schedule (via tasket) 2014 + * The sep_finish function is the function that is scheduled (via tasklet) 2015 2015 * by the interrupt service routine when the SEP sends and interrupt 2016 2016 * This is only called by the interrupt handler as a tasklet. 2017 2017 */ ··· 2249 2249 head_len = (block_size - int_ctx->prev_update_bytes) % block_size; 2250 2250 tail_len = (req->nbytes - head_len) % block_size; 2251 2251 2252 - /* Make sure all pages are even block */ 2252 + /* Make sure all pages are an even block */ 2253 2253 int_error = sep_oddball_pages(ta_ctx->sep_used, req->src, 2254 2254 req->nbytes, 2255 2255 block_size, &new_sg, 1); ··· 2482 2482 dev_dbg(&ta_ctx->sep_used->pdev->dev, "block_size is %x\n", block_size); 2483 2483 dev_dbg(&ta_ctx->sep_used->pdev->dev, "tail len is %x\n", tail_len); 2484 2484 2485 - /* Make sure all pages are even block */ 2485 + /* Make sure all pages are an even block */ 2486 2486 int_error = sep_oddball_pages(ta_ctx->sep_used, req->src, 2487 2487 req->nbytes, 2488 2488 block_size, &new_sg, 1);
+4 -4
drivers/staging/sep/sep_driver_api.h
··· 91 91 }; 92 92 93 93 /* 94 - command structure for building dcb block (currently for ext app only 94 + command structure for building dcb block (currently for ext app only) 95 95 */ 96 96 struct build_dcb_struct { 97 97 /* address value of the data in */ ··· 234 234 u32 dmatables_len; 235 235 /* size of input data */ 236 236 u32 input_data_len; 237 - /* secure dma use (for imr memory restriced area in output */ 237 + /* secure dma use (for imr memory restricted area in output) */ 238 238 bool secure_dma; 239 239 struct sep_dma_resource dma_res_arr[SEP_MAX_NUM_SYNC_DMA_OPS]; 240 240 /* Scatter gather for kernel crypto */ ··· 347 347 348 348 /** 349 349 * sep_free_dma_table_data_handler - free DMA table 350 - * @sep: pointere to struct sep_device 350 + * @sep: pointer to struct sep_device 351 351 * @dma_ctx: dma context 352 352 * 353 - * Handles the request to free DMA table for synchronic actions 353 + * Handles the request to free DMA table for synchronic actions 354 354 */ 355 355 int sep_free_dma_table_data_handler(struct sep_device *sep, 356 356 struct sep_dma_context **dma_ctx);
+2 -2
drivers/staging/sep/sep_driver_config.h
··· 43 43 #define SEP_DRIVER_POLLING_MODE 0 44 44 45 45 /* flag which defines if the shared area address should be 46 - reconfiged (send to SEP anew) during init of the driver */ 46 + reconfigured (send to SEP anew) during init of the driver */ 47 47 #define SEP_DRIVER_RECONFIG_MESSAGE_AREA 0 48 48 49 49 /* the mode for running on the ARM1172 Evaluation platform (flag is 1) */ ··· 166 166 (SEP_DRIVER_STATIC_AREA_OFFSET_IN_BYTES + \ 167 167 SEP_DRIVER_STATIC_AREA_SIZE_IN_BYTES) 168 168 169 - /* synhronic dma tables area offset */ 169 + /* synchronic dma tables area offset */ 170 170 #define SYNCHRONIC_DMA_TABLES_AREA_OFFSET_BYTES \ 171 171 (SEP_DRIVER_DATA_POOL_AREA_OFFSET_IN_BYTES + \ 172 172 SEP_DRIVER_DATA_POOL_SHARED_AREA_SIZE_IN_BYTES)
+18 -18
drivers/staging/sep/sep_main.c
··· 94 94 #endif 95 95 96 96 /** 97 - * Currenlty, there is only one SEP device per platform; 97 + * Currently, there is only one SEP device per platform; 98 98 * In event platforms in the future have more than one SEP 99 99 * device, this will be a linked list 100 100 */ ··· 106 106 * @sep: SEP device 107 107 * @sep_queue_info: pointer to status queue 108 108 * 109 - * This function will removes information about transaction from the queue. 109 + * This function will remove information about transaction from the queue. 110 110 */ 111 111 void sep_queue_status_remove(struct sep_device *sep, 112 112 struct sep_queue_info **queue_elem) ··· 294 294 end_function_setpid: 295 295 /* 296 296 * The pid_doing_transaction indicates that this process 297 - * now owns the facilities to performa a transaction with 297 + * now owns the facilities to perform a transaction with 298 298 * the SEP. While this process is performing a transaction, 299 299 * no other process who has the SEP device open can perform 300 300 * any transactions. This method allows more than one process ··· 447 447 448 448 /** 449 449 * sep_free_dma_table_data_handler - free DMA table 450 - * @sep: pointere to struct sep_device 450 + * @sep: pointer to struct sep_device 451 451 * @dma_ctx: dma context 452 452 * 453 - * Handles the request to free DMA table for synchronic actions 453 + * Handles the request to free DMA table for synchronic actions 454 454 */ 455 455 int sep_free_dma_table_data_handler(struct sep_device *sep, 456 456 struct sep_dma_context **dma_ctx) ··· 540 540 * don't have a page array; the page array is generated 541 541 * only in the lock_user_pages, which is not called 542 542 * for kernel crypto, which is what the sg (scatter gather 543 - * is used for exclusively 543 + * is used for exclusively) 544 544 */ 545 545 if (dma->src_sg) { 546 546 dma_unmap_sg(&sep->pdev->dev, dma->src_sg, ··· 1227 1227 /* Map array */ 1228 1228 struct sep_dma_map *map_array; 1229 1229 1230 - /* Set start and end pages and num pages */ 1230 + /* Set start and end pages and num pages */ 1231 1231 end_page = (app_virt_addr + data_size - 1) >> PAGE_SHIFT; 1232 1232 start_page = app_virt_addr >> PAGE_SHIFT; 1233 1233 num_pages = end_page - start_page + 1; ··· 1431 1431 /* Array of lli */ 1432 1432 struct sep_lli_entry *lli_array; 1433 1433 1434 - /* Set start and end pages and num pages */ 1434 + /* Set start and end pages and num pages */ 1435 1435 end_page = (app_virt_addr + data_size - 1) >> PAGE_SHIFT; 1436 1436 start_page = app_virt_addr >> PAGE_SHIFT; 1437 1437 num_pages = end_page - start_page + 1; ··· 1602 1602 * @num_table_entries_ptr: pointer to number of tables 1603 1603 * @table_data_size: total data size 1604 1604 * 1605 - * Builds ant lli table from the lli_array according to 1605 + * Builds an lli table from the lli_array according to 1606 1606 * the given size of data 1607 1607 */ 1608 1608 static void sep_build_lli_table(struct sep_device *sep, ··· 1701 1701 * @virt_address: virtual address to convert 1702 1702 * 1703 1703 * This functions returns the physical address inside shared area according 1704 - * to the virtual address. It can be either on the externa RAM device 1704 + * to the virtual address. It can be either on the external RAM device 1705 1705 * (ioremapped), or on the system RAM 1706 1706 * This implementation is for the external RAM 1707 1707 */ ··· 1725 1725 * 1726 1726 * This functions returns the virtual address inside shared area 1727 1727 * according to the physical address. It can be either on the 1728 - * externa RAM device (ioremapped), or on the system RAM 1728 + * external RAM device (ioremapped), or on the system RAM 1729 1729 * This implementation is for the external RAM 1730 1730 */ 1731 1731 static void *sep_shared_area_bus_to_virt(struct sep_device *sep, ··· 1891 1891 * @lli_table_ptr: 1892 1892 * @num_entries_ptr: 1893 1893 * @table_data_size_ptr: 1894 - * @is_kva: set for kernel data (kernel cryptio call) 1894 + * @is_kva: set for kernel data (kernel crypt io call) 1895 1895 * 1896 - * This function prepares only input DMA table for synhronic symmetric 1896 + * This function prepares only input DMA table for synchronic symmetric 1897 1897 * operations (HASH) 1898 1898 * Note that all bus addresses that are passed to the SEP 1899 1899 * are in 32 bit format; the SEP is a 32 bit device ··· 2174 2174 u32 last_table_flag = 0; 2175 2175 /* The data size that should be in table */ 2176 2176 u32 table_data_size = 0; 2177 - /* Number of etnries in the input table */ 2177 + /* Number of entries in the input table */ 2178 2178 u32 num_entries_in_table = 0; 2179 - /* Number of etnries in the output table */ 2179 + /* Number of entries in the output table */ 2180 2180 u32 num_entries_out_table = 0; 2181 2181 2182 2182 if (!dma_ctx) { ··· 2401 2401 * @table_data_size_ptr: 2402 2402 * @is_kva: set for kernel data; used only for kernel crypto module 2403 2403 * 2404 - * This function builds input and output DMA tables for synhronic 2404 + * This function builds input and output DMA tables for synchronic 2405 2405 * symmetric operations (AES, DES, HASH). It also checks that each table 2406 2406 * is of the modular block size 2407 2407 * Note that all bus addresses that are passed to the SEP ··· 2556 2556 "[PID%d] SEP_DRIVER_ENTRIES_PER_TABLE_IN_SEP is (hex) %x\n", 2557 2557 current->pid, SEP_DRIVER_ENTRIES_PER_TABLE_IN_SEP); 2558 2558 2559 - /* Call the fucntion that creates table from the lli arrays */ 2559 + /* Call the function that creates table from the lli arrays */ 2560 2560 dev_dbg(&sep->pdev->dev, "[PID%d] calling create table from lli\n", 2561 2561 current->pid); 2562 2562 error = sep_construct_dma_tables_from_lli( ··· 3663 3663 goto end_function; 3664 3664 } 3665 3665 3666 - /* Checks that user has called necessarry apis */ 3666 + /* Checks that user has called necessary apis */ 3667 3667 if (0 == test_bit(SEP_FASTCALL_WRITE_DONE_OFFSET, 3668 3668 &call_status->status)) { 3669 3669 dev_warn(&sep->pdev->dev,