aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-07-30staging: comedi: ni_tio: tidy up Gi_DMA_Config_Reg_BitsH Hartley Sweeten3-19/+10
Convert this enum into defines and rename the CamelCase symbols. For aesthetics, move the new defines so they are associated with the register define. Signed-off-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging: comedi: ni_tio: tidy up Gxx_Joint_Status2_BitsH Hartley Sweeten2-17/+4
Convert this enum into defines and rename the CamelCase symbols. For aesthetics, move the new defines so they are associated with the register define. Signed-off-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging: comedi: ni_tio: tidy up Gi_Reset_BitH Hartley Sweeten2-7/+2
Convert this inline CamelCase function into a define. For aesthetics, move the new define so it is associated with the register define. Signed-off-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging: comedi: ni_tio: tidy up Gxx_Status_BitsH Hartley Sweeten3-67/+14
Convert this enum into defines and rename the CamelCase symbols. For aesthetics, move the new defines so they are associated with the register define. Signed-off-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging: comedi: ni_tio: tidy up Gi_Second_Gate_BitsH Hartley Sweeten2-42/+25
Convert this enum into defines and rename the CamelCase symbols. For aesthetics, move the new defines so they are associated with the register define. Signed-off-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging: comedi: ni_tio: tidy up Gi_Mode_BitsH Hartley Sweeten3-49/+45
Convert this enum into defines and rename the CamelCase symbols. For aesthetics, move the new defines so they are associated with the register define. Signed-off-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging: comedi: ni_tio: tidy up Gi_Input_Select_BitsH Hartley Sweeten3-64/+53
Convert this enum into defines and rename the CamelCase symbols. For aesthetics, move the new defines so they are associated with the register define. Signed-off-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging: comedi: ni_tio: tidy up Gi_Auto_Increment_Reg_BitsH Hartley Sweeten1-4/+1
Convert this enum into defines and rename the CamelCase symbols. For aesthetics, move the new defines so they are associated with the register define. Signed-off-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging: comedi: ni_tio: tidy up Gi_Command_Reg_BitsH Hartley Sweeten3-34/+25
Convert this enum into defines and rename all the CamelCase symbols. For aesthetics, move the new defines so they are associated with the register define. Signed-off-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging: comedi: ni_tio: tidy up Gi_Counting_Mode_Reg_BitsH Hartley Sweeten2-91/+64
Convert this enum into defines and rename all the CamelCase symbols. For aesthetics, move the new defines so they are associated with the register define. Signed-off-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging: comedi: ni_tio: tidy up ni_tio_read_sw_save_reg()H Hartley Sweeten1-11/+6
Remove the need for some of the local variables. Signed-off-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging: comedi: amplc_pc236, amplc_pci236: get rid of bustypeIan Abbott3-5/+0
The `bustype` member of `struct pc236_board` variables is initialized, but never used. Remove it along with the enumerated constants associated with it. Signed-off-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging: comedi: amplc_pc236: split into ISA, PCI and common moduleIan Abbott6-353/+429
The "amplc_pc236" driver currently handles both ISA and PCI devices and uses a small amount of conditional compilation depending which are enabled. Move most of the functionality into a new module, "amplc_pc236_common", and split off support for PCI devices into a new module, "amplc_pci236". Retain support for ISA devices in the existing module, "amplc_pc236". Since the `detach` handler (`pc236_detach()`) in the existing module "amplc_pc236" now only needs to handle ISA devices and only calls `comedi_legacy_detach()`, just use `comedi_legacy_detach()` directly as the `detach` handler in `struct comedi_driver amplc_pc236_driver`. Signed-off-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging: comedi: amplc_pc236: add callback to check and clear interruptIan Abbott1-16/+24
Add an optional callback function pointer to the board data to be called when checking if an interrupt has occurred and to clear it if it has. Since the callback returns `bool`, change a few other `int` values to `bool` to match. Signed-off-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging: comedi: amplc_pc236: combine interrupt enable/disable functionsIan Abbott1-30/+7
`pc236_intr_enable()` and `pc236_intr_disable()` are very similar. Combine them into a single function `pc236_intr_update()` with a parameter to indicate whether interrupts are being enabled or disabled. Change type type of the `enable_irq` member of the private data to `bool` to match the parameter. Signed-off-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging: comedi: amplc_pc236: add callback to enable/disable interruptIan Abbott1-4/+14
Add an optional callback function pointer to the board data to be called when interrupts are logically enabled or disabled to update the hardware registers. Signed-off-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging: comedi: amplc_pc236: don't disable h/w interrupt on detach()Ian Abbott1-2/+0
If an asynchronous command was running when the device is being detached, the comedi core would have called the subdevice `cancel` handler (`pc236_intr_cancel()`) before calling the `detach` handler (`pc236_detach()`). Since the cancel handler disables hardware interrupts (at least for the PCI236 board) by calling `pc236_disable_intr()`, there is no need for the detach handler to do so as well. Remove the call to `pc236_disable_intr()` from `pc236_detach()`. Signed-off-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging: comedi: amplc_pc236: move static board dataIan Abbott1-12/+12
Move the static board data in `pc236_isa_boards[]` and `pc236_pci_board` closer to where they are used. Signed-off-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging: comedi: amplc_dio200_pci: no need to test board pointer in ↵Ian Abbott1-4/+1
dio200_pci_detach() `dio200_pci_detach()` doesn't need to check if the pointer to constant board data (`thisboard`) and the pointer to private per-device data (`devpriv`) are valid before calling `amplc_dio200_common_detach()`. It has no further need to check `thisboard` so remove the variable altogether. Move the test of `devpriv` to the first point it is needs to be valid. Signed-off-by: Ian Abbott <[email protected]> Reviewed-by: H Hartley Sweeten <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging: comedi: amplc_dio200_common: remove some tests from ↵Ian Abbott1-5/+0
amplc_dio200_common_detach() `amplc_dio200_common_detach()` doesn't do much apart from freeing the IRQ handler that was requested by `amplc_dio200_common_attach()` if `dev->irq` is non-zero. There is no need to check if the pointer to the constant board data or the pointer to private per-device data exist, so remove those tests. Signed-off-by: Ian Abbott <[email protected]> Reviewed-by: H Hartley Sweeten <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging: comedi: amplc_dio200_common: prevent extra free_irq()Ian Abbott1-1/+3
`dio200_detach()` in "amplc_dio200.c" calls `amplc_dio200_common_detach()` in "amplc_dio200_common.c", followed by `comedi_legacy_detach()` in "../drivers.c". Both of those functions call `free_irq()` if `dev->irq` is non-zero. The second call produces a warning message because the handler has already been freed. Prevent that by setting `dev->irq = 0` in `amplc_dio200_common_detach()`. Signed-off-by: Ian Abbott <[email protected]> Reviewed-by: H Hartley Sweeten <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging: usbip: remove redundant return statementsMax Vozeler3-4/+0
Remove redundant return statements at the end of void functions. This addresses the checkpatch.pl warnings: WARNING: void function return statements are not generally useful Signed-off-by: Max Vozeler <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging: vt6655: coding style: Fixed commenting styleRahul Garg1-1/+1
fix coding style: use C89 comments, not C99 Signed-off-by: Rahul Garg <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging: vt6655: fix direct dereferencing of user pointerGuillaume Clement3-14/+26
Sparse reported that the data from tagSCmdRequest is given by userspace, so it should be tagged as such. Later, we were memcomparing and dereferencing it without first copying it, fix that as well. Signed-off-by: Guillaume Clement <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-30staging: ion: vm_insert_pfn and zap_page_range rely on CONFIG_MMUFabian Frederick1-1/+1
Fix following sh-allmodconfig errors reported on kisskb " drivers/built-in.o: In function `ion_vm_fault': ion.c:(.text+0x1f2d8f8): undefined reference to `vm_insert_pfn' drivers/built-in.o: In function `ion_buffer_sync_for_device': ion.c:(.text+0x1f316bc): undefined reference to `zap_page_range' make: *** [vmlinux] Error 1 " Signed-off-by: Fabian Frederick <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: sep: remove driverKristina Martšenko13-9880/+0
Looks like no one's working on the driver anymore, so remove it for now. If someone wants to work on moving it out of staging, this commit can be reverted. Signed-off-by: Kristina Martšenko <[email protected]> Cc: Alan Cox <[email protected]> Cc: Mark A. Allyn <[email protected]> Cc: Jayant Mangalampalli <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: ft1000: remove procfs entriesNicolas Thery9-474/+2
This patch started as a fix to some checkpatch complaints in ft1000 procfs code but Greg suggested to remove the procfs entries altogether: http://driverdev.linuxdriverproject.org/pipermail/driverdev-devel/2014-July/055594.html Signed-off-by: Nicolas Thery <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: lustre: lov: Fix sparse warning using plain integer as NULL pointerMarc Fite1-3/+3
This patch fixes the warning generated by sparse: "Using plain integer as NULL pointer" by replacing the offending 0s with NULL. drivers/staging/lustre/lustre/lov/lov_obd.c:902:48: warning: Using plain integer as NULL pointer drivers/staging/lustre/lustre/lov/lov_obd.c:946:54: warning: Using plain integer as NULL pointer drivers/staging/lustre/lustre/lov/lov_obd.c:2819:46: warning: Using plain integer as NULL pointer Signed-off-by: Marc Fite <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: rtl8821ae: fixed a space coding style issueSylvain Calador1-1/+1
Fixed a coding style issue. Signed-off-by: Sylvain Calador <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: usbip: stub_main.c: Cleaning up missing null-terminate in ↵Rickard Strandqvist1-7/+3
conjunction with strncpy Replacing strncpy with strlcpy to avoid strings that lacks null terminate. Signed-off-by: Rickard Strandqvist <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: unisys: include: uisutils.h: Cleaning up missing null-terminate in ↵Rickard Strandqvist1-4/+4
conjunction with strncpy Replacing strncpy with strlcpy to avoid strings that lacks null terminate. Signed-off-by: Rickard Strandqvist <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: dgnc: remove commented codeSeunghun Lee5-156/+1
This patch removes commented code in dgnc driver. CC: Lidza Louina <[email protected]> CC: Mark Hounschell <[email protected]> Signed-off-by: Seunghun Lee <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27Staging: vt6655: removed redundant comments from power.hIgor Bezukh1-9/+0
Removed redundant comments from power.h header file. Signed-off-by: Igor Bezukh <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27Staging: vt6655: removed redundant comments from michael.hIgor Bezukh1-6/+0
Removed redundant comments from michael.h header file. Signed-off-by: Igor Bezukh <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27Staging: vt6655: removed redundant comments from mib.hIgor Bezukh1-29/+16
Removed redundant comments from mib.h header file. Signed-off-by: Igor Bezukh <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27Staging: vt6655: removed redundant comments from iowpa.hIgor Bezukh1-10/+0
Removed redundant comments from iowpa.h header file. Signed-off-by: Igor Bezukh <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27Staging: vt6655: removed redundant comments from ioctl.hIgor Bezukh1-8/+0
Removed redundant comments from ioctl.h header file. Signed-off-by: Igor Bezukh <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27Staging: vt6655: removed redundant comments from iocmd.hIgor Bezukh1-22/+1
Removed redundant comments from iocmd.h header file. Signed-off-by: Igor Bezukh <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27Staging: vt6655: removed redundant comments from IEEE11h.hIgor Bezukh1-10/+0
Removed redundant comments from IEEE11h.h header file. Signed-off-by: Igor Bezukh <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27Staging: vt6655: removed redundant comments from hostap.hIgor Bezukh1-8/+0
Removed redundant comments from hostap.h header file. Signed-off-by: Igor Bezukh <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27Staging: vt6655: removed redundant comments from dpc.hIgor Bezukh1-8/+0
Removed redundant comments from dpc.h header file. Signed-off-by: Igor Bezukh <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27Staging: vt6655: removed redundant comments from device_cfg.hIgor Bezukh1-3/+0
Removed redundant comments from device_cfg.h header file. Signed-off-by: Igor Bezukh <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27Staging: vt6655: removed redundant comments from desc.hIgor Bezukh1-98/+87
Removed redundant comments from desc.h header file. Signed-off-by: Igor Bezukh <[email protected]> C99 style comments will be fixed in further patches. Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27Staging: vt6655: removed redundant comments from channel.hIgor Bezukh1-4/+0
Removed redundant comments from channel.h header file. Signed-off-by: Igor Bezukh <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27Staging: vt6655: removed redundant comments from country.hIgor Bezukh1-1/+0
Removed redundant comments from country.h header file Signed-off-by: Igor Bezukh <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27Staging: vt6655: removed redundant comments from datarate.hIgor Bezukh1-19/+9
Removed redundant comments from datarate.h header file. Signed-off-by: Igor Bezukh <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27Staging: vt6655: remove redundant comments from card.hIgor Bezukh1-9/+1
Removed redundant comments from card.h header file. Signed-off-by: Igor Bezukh <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: bcm: DDRInit.c: fixed coding style: lines over 80 charSudip Mukherjee1-20/+39
Signed-off-by: Sudip Mukherjee <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2014-07-27staging: comedi: amplc_pc236: set board_name before common attachIan Abbott1-2/+1
For PCI boards, the `auto_attach` handler, `pc236_auto_attach()`, initializes `dev->board_ptr` to point to a `struct pc236_board`, but leaves `dev->board_name` unchanged. The Comedi core will have initialized `dev->board_name` to the `driver_name` string member of `amplc_pc236_driver`. For consistency with ISA boards manually configured by the `COMEDI_DEVCONFIG` ioctl via the legacy `attach` handler, `pc236_attach()`, set `dev->board_name` to the `name` member of the `struct pc236_board` pointed to by `dev->board_ptr`. Both `pc236_attach()` and `pc236_auto_attach()` call `pc236_common_attach()`, which also sets `dev->board_name` to the `name` member of the `struct pc236_board`. Since this assignment no longer changes anything, remove it. A nice side-effect of this change is that the same owner name string is used for requesting I/O regions (before the call the `pc236_common_attach()`) as is used for requesting the IRQ handler (during the call to `pc236_common_attach()`). It was already the same for (manually configured) ISA boards, but is now the same for (automatically configured) PCI boards. 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 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]>