aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-07-27staging: comedi: amplc_pc236: remove PCI device ID macrosIan Abbott1-6/+2
The `PCI_DEVICE_ID_AMPLICON_PCI236` macro is only used once, in the module device table, so remove it and expand the macro in the table. `The `PCI_DEVICE_ID_INVALID` macro is no longer used, so remove it. Signed-off-by: Ian Abbott <[email protected]> Reviewed-by: H Hartley Sweeten <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: comedi: amplc_pc236: Simplify PCI board look-upIan Abbott1-25/+4
Since only a single PCI board is supported by the driver, there is no need to call `pc236_find_pci_board()` to find the a board entry with matching PCI device ID in `pc236_pci_boards[]`. Just point to the entry directly and remove the look-up function. In fact, there is no reason for `pc236_pci_boards[]` to be an array, so change it to a non-array variable and rename it to `pc236_pci_board`. Also, the `devid` member of `struct pc236_board` is no longer needed as it was only used by the look-up function, so remove it. Signed-off-by: Ian Abbott <[email protected]> Reviewed-by: H Hartley Sweeten <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: comedi: amplc_pc236: don't check bus type in attachIan Abbott1-18/+8
Since the legacy attach routine `pc236_attach()` is only called for board names matching an entry in our array of ISA boards `pc236_isa_boards[]`, and it is reasonable to expect all elements of `pc236_isa_boards[]` to have their `bustype` member initialized correctly to `isa_bustype`, don't bother checking the bus type in `pc236_attach()`. Add `if (!DO_ISA) return -EINVAL` to optimize out the remainder of the function if `CONFIG_COMEDI_AMPLC_PC236_ISA` is not defined. Similarly, don't bother checking the bus type in `pc236_find_pci_board()` as it is reasonable to expect all elements of `pc236_pci_boards[]` to have their `bustype` member initialized correctly to `pci_bustype`. Signed-off-by: Ian Abbott <[email protected]> Reviewed-by: H Hartley Sweeten <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: comedi: amplc_pc236: split pc236_boards[] into ISA & PCIIan Abbott1-11/+13
Split `pc236_boards[]` into `pc236_isa_boards[]` for ISA cards and `pc236_pci_boards[]` for PCI cards (there is only one of each). Only initialize the board name look-up members of `struct comedi_driver amplc_pc236_driver` if the ISA part of the driver is enabled in the kernel config (`CONFIG_COMEDI_AMPLC_PC236_ISA`) using the array of ISA boards (`pc236_isa_boards[]`). The driver doesn't allow manual configuration of PCI devices, so there is no point having the comedi core match the names of the PCI boards before it calls our driver's legacy attach routine (`pc236_attach()`). Signed-off-by: Ian Abbott <[email protected]> Reviewed-by: H Hartley Sweeten <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: comedi: amplc_pc236: remove 'model' memberIan Abbott1-4/+0
The `model` member of `struct pc236_board` is no longer used since the code to remove manual configuration of PCI devices was removed. Get rid of it. Signed-off-by: Ian Abbott <[email protected]> Reviewed-by: H Hartley Sweeten <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: comedi: amplc_pc236: absorb pc236_pci_common_attach()Ian Abbott1-17/+9
Absorb `pc236_pci_common_attach()` into `pc236_auto_attach()` since that's the only place it is called from. Signed-off-by: Ian Abbott <[email protected]> Reviewed-by: H Hartley Sweeten <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: comedi: amplc_pc236: no need to set hw_devIan Abbott1-2/+0
The call to `comedi_set_hw_dev()` from `pc236_pci_common_attach()` is now unnecessary since `pc236_pci_common_attach()` is now only called from this driver's `auto_attach` hook `pc236_auto_attach()` and the comedi core now calls `comedi_set_hw_dev()` before calling that. Remove the unnecessary call. Signed-off-by: Ian Abbott <[email protected]> Reviewed-by: H Hartley Sweeten <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: comedi: amplc_pc236: no need to manipulate PCI ref countIan Abbott1-11/+0
Now that this driver no longer supports "manual" attachment of PCI devices in its `attach` hook (`pc236_attach()`), it no longer has code that searches for a suitable PCI device and increments its reference count. Since the driver no longer has any reason for incrementing and decrementing the PCI device's reference count, the calls to `pci_dev_get()` and `pci_dev_put()` can be removed. Signed-off-by: Ian Abbott <[email protected]> Reviewed-by: H Hartley Sweeten <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: comedi: amplc_pc236: remove manual configuration of PCI boardsIan Abbott1-63/+9
Remove the code that allows PCI boards to be manually attached by the `COMEDI_DEVCONFIG` ioctl (or the "comedi_config" application). Supported PCI boards (PCI236) will be attached automatically at probe time via `comedi_pci_auto_config()` and the `auto_attach` hook in the `struct comedi_driver`. The "wildcard" entry in `pc236_boards[]` was only used when manually attaching a PCI board using a driver name instead of a board name, so is no longer needed. Remove it. Signed-off-by: Ian Abbott <[email protected]> Reviewed-by: H Hartley Sweeten <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: comedi: amplc_pc236: remove some boilerplate commentsIan Abbott1-21/+0
Signed-off-by: Ian Abbott <[email protected]> Reviewed-by: H Hartley Sweeten <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: comedi: amplc_pc236: reformat header commentsIan Abbott1-46/+46
Use preferred style for copyright and driver description comments. Signed-off-by: Ian Abbott <[email protected]> Reviewed-by: H Hartley Sweeten <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: unisys: remove partition information from procBenjamin Romer1-99/+0
Debugging information for the guest's channels was being exposed in proc. Remove the code that creates these entries, which are no longer needed. Signed-off-by: Benjamin Romer <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: silicom: remove driverKristina Martšenko20-10576/+0
The driver hasn't been cleaned up and it doesn't look like anyone is working on it anymore (including the original author). So remove it. If someone wants to work on cleaning the driver up and moving it out of staging, this commit can be reverted. In addition, since this removes the CONFIG_NET_VENDOR_SILICOM config symbol, remove the symbol from all defconfig files that reference it. Signed-off-by: Kristina Martšenko <[email protected]> Cc: Daniel Cotey <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging/lustre: Fix sparse error (signature mismatch)L. Alberto Giménez1-1/+1
lprocfs_wr_atomic is defined in drivers/staging/lustre/lustre/obdclass/lprocfs_status.c with its second argument with the __user attribute: int lprocfs_wr_atomic(struct file *file, const char __user *buffer, unsigned long count, void *data) but its declaration in drivers/staging/lustre/lustre/include/lprocfs_status.h does not include the attribute. Make declaration and definition match. Signed-off-by: L. Alberto Giménez <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: vt6655: Remove NULL pointer sparse warningGuillaume Clement1-1/+1
We were using 0 instead of NULL to initialize a pointer, which caused a sparse warning. Signed-off-by: Guillaume Clement <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: vt6655: remove unused macroGuillaume Clement1-1/+0
The MAC_MAX_CONTEXT_SIZE macro was not enclosed into parenthesis, which might have caused hard to debug errors, and caused a sparse warning. Since it is unused, we might as well remove it. Signed-off-by: Guillaume Clement <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: vt6655: fix braces at newline in if statementsGuillaume Clement2-6/+7
Braces should not be in a separate line for multi-line if statements. This fixes warnings reported by checkpatch. Signed-off-by: Guillaume Clement <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: vt6655: remove braces for single statements ifGuillaume Clement3-6/+3
This fixes several "braces {} are not necessary for single statement blocks" checkpatch warnings. Signed-off-by: Guillaume Clement <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: vt6655: add missing whitespaceGuillaume Clement1-5/+5
Some whitespace were missing, causing checkpatch warnings and altering readability. Signed-off-by: Guillaume Clement <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: vt6655: Remove unreachable break statementsGuillaume Clement2-3/+0
This fixes break "break is not useful after a goto or return" checkpatch warnings. Signed-off-by: Guillaume Clement <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: vt6655: break single line if statementsGuillaume Clement2-4/+8
This fixes the "trailing statements should be on next line" checkpatch warning. Signed-off-by: Guillaume Clement <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: vt6655: Use pr_* functions instead of printkGuillaume Clement9-66/+69
Lots of printk are used in vt6655, replace them with the pr_* equivalent. Signed-off-by: Guillaume Clement <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: vt6655: fix static position in inline functionGuillaume Clement1-2/+2
This should be "static inline", not "inline static". Reported by checkpatch. Signed-off-by: Guillaume Clement <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: vt6655: fix braces at newline for structsGuillaume Clement4-26/+13
For structs definitions, the braces should be at the end of the line. Reported by checkpatch. Signed-off-by: Guillaume Clement <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: vt6655: fix function braces not on the proper lineGuillaume Clement2-32/+64
Function braces should be on a separate line. Reported by checkpatch. Signed-off-by: Guillaume Clement <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: vt6655: Remove spaces before quoted newlinesGuillaume Clement10-122/+125
This fixes several spaces added just before a newline in debug strings, reported by checkpatch. Signed-off-by: Guillaume Clement <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: vt6655: Add missing blank lines after declarationsGuillaume Clement16-0/+52
This patch fixes the missing blank lines after declarations in vt6655 reported by checkpatch. Signed-off-by: Guillaume Clement <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: vt6655: remove useless return statementsGuillaume Clement13-112/+0
Many return statements in void function were present at the end of functions, with no effect. They now are removed. This fixes a bunch of checkpatch warnings. Signed-off-by: Guillaume Clement <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: vt6656: wcmd.h remove dead macrosMalcolm Priestley1-3/+0
AUTHENTICATE_TIMEOUT ASSOCIATE_TIMEOUT Signed-off-by: Malcolm Priestley <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: vt6656: rf.h cleanup C_PWBT commentsMalcolm Priestley1-1/+1
Signed-off-by: Malcolm Priestley <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: vt6656: power.h remove dead macrosMalcolm Priestley1-2/+0
Signed-off-by: Malcolm Priestley <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: vt6656: dpc remove unneeded headersMalcolm Priestley2-4/+0
Signed-off-by: Malcolm Priestley <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: vt6656: dpc.h remove dead function prototypesMalcolm Priestley1-4/+0
Removing RXvWorkItem RXvFreeRCB Signed-off-by: Malcolm Priestley <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: comedi: ni_tio: convert printk to pr_errH Hartley Sweeten1-1/+1
Convert the printk(KERN_ERR ...) in ni_m_clk_src() to a pr_err(). Signed-off-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: comedi: ni_tio: remove forward declarationsH Hartley Sweeten1-198/+194
Move some of the functions to remove the need for the forward declarations. Signed-off-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: comedi: ni_tio: tidy up ni_tio_set_clock_src() and helpersH Hartley Sweeten1-23/+15
Do some renaming of local vars, etc. to tidy up the ugly line breaks to improve the readability of the code. Signed-off-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: comedi: ni_tio: tidy up ni_tio_get_clock_src()H Hartley Sweeten1-2/+2
Remove the static const local variable and add a blank line after the declarations. Signed-off-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: comedi: ni_tio: absorb ni_tio_set_first_gate_modifiers()H Hartley Sweeten1-18/+10
This function is only called by ni_tio_set_gate_src(). For aesthetics, absorb the code into that function.. Signed-off-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: comedi: ni_tio: tidy up ni_tio_set_gate_src() and helpersH Hartley Sweeten1-39/+29
Do some renaming of local vars, parameters, etc. to tidy up the ugly line breaks to improve the readability of the code. Signed-off-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: comedi: ni_tio: tidy up ni_tio_set_other_src()H Hartley Sweeten1-26/+24
Invert the counter_dev->variant test to reduce the indent level of this function. Signed-off-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: comedi: ni_tio: tidy up ni_tio_get_gate_src() and helpersH Hartley Sweeten1-53/+37
Do some renaming of local vars, parameters, etc. to tidy up the ugly line breaks to improve the readability of the code. Signed-off-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: comedi: ni_tio: absorb ni_tio_counter_status()H Hartley Sweeten1-16/+9
This function is only called to handle the INSN_CONFIG_GET_COUNTER_STATUS instruction. For aesthetics, absorb the code into ni_tio_insn_config(). Signed-off-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: comedi: ni_tio: tidy up ni_tio_set_sync_mode()H Hartley Sweeten1-4/+7
Fix the > 80 char line issues in this function. Signed-off-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: comedi: ni_tio: tidy up ni_660x_source_select_bits()H Hartley Sweeten1-6/+4
Rename a local variable to fix the > 80 char line issues. Signed-off-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: comedi: ni_tio: tidy up ni_m_series_source_select_bits()H Hartley Sweeten1-5/+5
Rename a local variable to fix the > 80 char line issues. Signed-off-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: comedi: ni_tio: rename ni_tio_second_gate_registers_present()H Hartley Sweeten1-4/+4
For aesthetics, rename this function to shorten some of the long lines. Signed-off-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: comedi: ni_tio: tidy up ni_tio_init_counter()H Hartley Sweeten1-43/+38
This function is called to initialize/reset a gpct counter during a comedi drivers (*attach). For aesthetics, move this exported function toward the end of the file. Tidy up the functions a bit by just open coding the '0x0' values used to initialize some of the registers. Signed-off-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: comedi: ni_tio: tidy up ni_gpct_device_{construct,destroy)()H Hartley Sweeten1-46/+55
For aesthetics, move these exported functions to the end of the file. Tidy up the functions a bit and remove the BUG_ON when (num_counters == 0). Signed-off-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: comedi: ni_tio: move defines to head of fileH Hartley Sweeten1-64/+67
For aesthetics, move all the defines to the head of the file. Signed-off-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: comedi: ni_tio: tidy up enum ni_660x_clock_sourceH Hartley Sweeten1-26/+23
These values are not used as an enum. For aesthetics, rename the CamelCase values and convert them into defines. Signed-off-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>