- 18 Jan, 2013 36 commits
-
-
Peter Huewe authored
This patch removes the boring init/exit functions with the new module_comedi_pcmcia_driver macro. Signed-off-by:
Peter Huewe <peterhuewe@gmx.de> Signed-off-by:
Ian Abbott <abbotti@mev.co.uk> Signed-off-by:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
Peter Huewe authored
This patch removes the boring init/exit functions with the new module_comedi_pcmcia_driver macro. Signed-off-by:
-
Peter Huewe authored
This patch removes the boring init/exit functions with the new module_comedi_pcmcia_driver macro. Signed-off-by:
-
Peter Huewe authored
This patch removes the boring init/exit functions with the new module_comedi_pcmcia_driver macro. Also removed the superflous #ifdef MODULE Signed-off-by:
-
Peter Huewe authored
This patch removes the boring init/exit functions with the new module_comedi_pcmcia_driver macro. Also removed the superflous #ifdef MODULE Signed-off-by:
-
Peter Huewe authored
This patch removes the boring init/exit functions with the new module_comedi_pcmcia_driver macro. Signed-off-by:
-
Peter Huewe authored
This patch introduces a new macro 'module_comedi_pcmcia_driver' for comedi PCMCIA drivers which do not do anything special in module init/exit. This eliminates a lot of boilerplate. Adapted from 'module_comedi_pci_driver' Signed-off-by:
-
Jake Champlin authored
Fixed coding style issue from spaces to tabs. Signed-off-by:
Jake Champlin <jake.champlin.27@gmail.com> Signed-off-by:
-
H Hartley Sweeten authored
If an attempt is made to free more bytes than have been allocated a dev_info message is output and the number of bytes to free is adjusted to the allocated size. Telling the user this happened is just noise. Remove the message. Signed-off-by:
H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbobbi@mev.co.uk> Signed-off-by:
-
H Hartley Sweeten authored
If an attempt is made to free more bytes than have been allocated a dev_info message is output and the number of bytes to free is adjusted to the allocated size. Telling the user this happened is just noise. Remove the message. Signed-off-by:
-
H Hartley Sweeten authored
Due to the 'while(count < num_bytes)' the computed 'block_size' will always be a value greater than 0. Remove the unreachable dev_warn and the (block_size < 0) test. Signed-off-by:
-
H Hartley Sweeten authored
The condition that would trigger this BUG_ON can never occur. The 'munge_count' will be equal to 'buf_write_count' if all the data in the buffer has been munged. Or, the 'munge_count' will be less than the 'buf_write_count' if any partial samples in the buffer were not munged. The 'munge_count' will never be greater than the 'buf_write_count'. Remove the unnecessary BUG_ON. Signed-off-by:
-
H Hartley Sweeten authored
For aesthetic reasons, reorder the prototypes for the exported comedi_buf_* functions in comedidev.h to follow the function declarations in comedi_buf.c. Also, change a couple of the return values from 'unsigned' to 'unsigned int' to match the value actually returned. Signed-off-by:
-
H Hartley Sweeten authored
This helper function is only called by the comedi core in comedi_buf.c and comedi_fops.c. For aesthetic reasons, move it to comedi_buf.c and remove the inline. Move the prototype from comedidev.h to comedi_internal.h so it's not exposed outside the comedi core. Signed-off-by:
-
H Hartley Sweeten authored
This helper function is only called in comedi_buf.c. Move it there and make it static so it's not exposed globally. Signed-off-by:
-
H Hartley Sweeten authored
Reword the comment about the need for the smp_mb(). Clarify the check to make sure the number of bytes to free is not more than the number of bytes allocated. Signed-off-by:
-
H Hartley Sweeten authored
Clarify the check to make sure the number of bytes to allocate is available. Reword the comment about the need for the smp_rmb(). Signed-off-by:
-
H Hartley Sweeten authored
For aesthetic reasons, cleanup this function a bit. Change the (async == NULL) test to simply (!async). Reword the comment about the need for the smp_rmb().. Signed-off-by:
-
H Hartley Sweeten authored
Use the helper comedi_buf_write_n_allocated() to clarify the check to make sure the number of bytes to free is not more than the number of bytes allocated. Signed-off-by:
-
H Hartley Sweeten authored
Refactor this function so there is a single return point and only one BUG_ON check. The BUG_ON needs to be looked at to see if it can be safely removed. Clarify the test in the munge loop that checks for a block copy that would extend pass the end of the prealloc_buf. Reword the comment about the need for the smp_wmb(). Signed-off-by:
-
H Hartley Sweeten authored
This function is only called by comedi_buf_put(). Remove it and just call __comedi_buf_write_alloc() directly with the strict flag set. Signed-off-by:
-
H Hartley Sweeten authored
The only difference between comedi_buf_write_alloc() and the *_strict() version is that the *_strict() one will only allocate the chunk if it can completely fulfill the request. Factor out the common code and add a flag parameter to indicate the 'strict' usage. Change the exported functions so they are just wrappers around the common function. Cleanup the common function a bit and use the comedi_buf_write_n_available() helper to determine the number of bytes available. comedi_buf_write_n_available() is not used outside this module so make it static. Since the only caller is __comedi_buf_write_alloc(), which will always have a valid async pointer and already has a memory barrier, we can remove the unnecessary (async == NULL) test as well as the smp_mb(). Also, the rounding of the sample size can be removed since the caller does not need it. Signed-off-by:
-
H Hartley Sweeten authored
For aesthetic reasons, rename this function to comedi_buf_reset(). This makes all the asynchronous buffer functions have the same namespace. Signed-off-by:
-
H Hartley Sweeten authored
The function comedi_buf_alloc() first frees any allocated buffer then, optionally, allocates a new buffer. Factor out the new buffer allocation code to a new function. This allows reducing the indent level and makes the code a bit cleaner. Also, cleanup to factored out code to make it a bit more concise. Use a local variable for the current comedi_buf_page being allocated. This cleans up the ugly line breaks used to keep the lines < 80 chars. Move the #ifdef'ery for the page protection determination out of the vmap() call. Signed-off-by:
-
H Hartley Sweeten authored
The function comedi_buf_alloc() uses two loops to free the async buffer's buf_page_list. The first one is used at the beginning to deallocate the current buffer. The second is used to cleanup if the new buffer allocation fails. Factor out the common code to a new function. Signed-off-by:
-
H Hartley Sweeten authored
Create a new file, comedi_buf.c, to hold all the comedi_async buffer functions. Currently they are all in drivers.c and really don't have any association with that source file. Signed-off-by:
-
H Hartley Sweeten authored
All the comedi drivers have been converted to use the request_firmware() hotplug interface. The COMEDI_DEVCONFIG ioctl support for passing the firmware blob as 'aux_data' is no longer required. Remove the feature and give the user a dev_warn message if it is attempted. Signed-off-by:
-
Ian Abbott authored
Setting `info = comedi_file_info_from_minor(minor)` and `dev = comedi_dev_from_minor(minor)` in the same function is a bit of a waste. The latter function is just a call of the former followed by a conditional return of an embedded pointer (`info->device`) or NULL. The former function uses a spin-lock which is where the wastfulness comes in. Move the "followed by a conditional return of an embedded pointer" part into a new function `comedi_dev_from_file_info` and call this instead of `comedi_dev_from_minor()` in the places where `comedi_file_info_from_minor()` is also called. Signed-off-by:
-
Omar Ramirez Luna authored
There is no way to specify the value of iva_img and since this code is not being used, remove it. This analysis resulted from a report by Chen Gang <gang.chen@asianux.com>, mentioning that the existing code was wrongly specifying the size to be copied. Signed-off-by:
Omar Ramirez Luna <omar.ramirez@copitl.com> Signed-off-by:
-
Omar Ramirez Luna authored
Instead of ioremapping SCM registers, use the correspondent layer to write into them. This allows us to get rid of a layer violation, since the registers are no longer touched by driver code. Signed-off-by:
-
Omar Ramirez Luna authored
On both counts, sym_name could be printed uninitialized, this is solved by moving the pr_* statement to be triggered if the value is assigned. Reported-by:
Chen Gang <gang.chen@asianux.com> Signed-off-by:
-
Omar Ramirez Luna authored
The value allocated doesn't match the one that is meant to be stored, resulting in corruption of memory for longer strings that can't be held in such space. Fix by allocating the correct byte value for the string meant to be stored. Signed-off-by:
-
Omar Ramirez Luna authored
The name of the firmware (drv_datap->base_img) could potentially become equal to 255 valid characters (size of exec_file), this will result in an out of bounds write, given that the 255 chars along with a '\0' terminator will be copied into an array of 255 chars. Produce an error on this cases, because the driver expects the NULL ending to be among the 255 char limit. Reported-by:
-
Jake Champlin authored
Fixed coding style issue with single line braces. Signed-off-by:
-
Dan Carpenter authored
IIR_RS232 is zero so "if (IIR_RS232 == (b_ret & IIR_RS232))" is always true so RS232 was always chosen by default. The test should be "if (0 == (b_ret & 0x30)) { ". The other tests should also be in that format. This does change how the code works... If 0x30 is set then it now defaults to RS232 instead of RS485. Signed-off-by:Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by:
-
Dan Carpenter authored
Avoid dereverencing the ERR_PTR() by shifting the dereference down a couple lines. Signed-off-by:
-
- 17 Jan, 2013 4 commits
-
-
Cruz Julian Bishop authored
This fixes all instances of "Please, no spaces at start of a new line" "Please, no spaces before tabs" Please note that I probably got the warning names wrong, but they should be close enough for usage here :) Additional post-commit note: There is one comment on line 230ish in slic.h that appears to have lost it's formatting. It was fine when I was working in Geany, but it caught my eye in the below diff. Sorry if it actually happened! Signed-off-by:
Cruz Julian Bishop <cruzjbishop@gmail.com> Signed-off-by:
-
Cruz Julian Bishop authored
The errors fixed are all instances of "ERROR: do not use assignment in if condition" Signed-off-by:
-
Cruz Julian Bishop authored
I'm assuming that "CRC shit reg" is referencing the CRC register/registry. Please ignore this patch if "shit" is actually in context Signed-off-by:
-
Dan Carpenter authored
This is a static checker fix. From the context it looks like there should be a break here. Signed-off-by:
-
