summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* vme: change bus error handling schemeDmitry Kalinkin2015-10-044-110/+91
| | | | | | | | | | | | | | | | | | | The current VME bus error handler adds errors to the bridge error list. vme_master_{read,write} then traverses that list to look for relevant errors. Such scheme didn't work well for accesses going through vme_master_mmap because they would also allocate a vme_bus_error, but have no way to do vme_clear_errors call to free that memory. This changes the error handling process to be other way around: now vme_master_{read,write} defines a window in VME address space that will catch possible errors. VME bus error interrupt only traverses these windows and marks those that had errors in them. Signed-off-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com> Cc: Igor Alekseev <igor.alekseev@itep.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* vme: include address space in error filteringDmitry Kalinkin2015-10-043-23/+46
| | | | | | | | | | Also changes vme_bus_error_handler to take generic address modifier code instead of raw contents of a device-specific attribute register. Signed-off-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com> Cc: Igor Alekseev <igor.alekseev@itep.ru> Acked-by: Martyn Welch <martyn@welchs.me.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* vme: move tsi148 error handling into VME subsystemDmitry Kalinkin2015-10-043-86/+99
| | | | | | | | | | | | | | Error handling code found in tsi148 is not device specific. In fact it already relies on shared vme_bus_error struct and vme_bridge.vme_errors field. The other bridge driver could reuse this code if it is shared. This introduces a slight behavior change: vme error message won't be triggered in a rare case when err_chk=1 and kmalloc fails. Signed-off-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com> Cc: Igor Alekseev <igor.alekseev@itep.ru> Acked-by: Martyn Welch <martyn@welchs.me.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* vme: lower alignment requirement in pci bridge driversDmitry Kalinkin2015-10-042-2/+2
| | | | | | | | | | | | | | Universe II allows PCI address grannularity of 4K or 64K depending on the window id. tsi148 only supports 64K. Existing driver implementations are validating window size against this grannularity and then use that very size as alignment parameter to pci_bus_alloc_resource. This constraint is excessive, alignment by granularity should be enough. This changes alignment constraint from size to a fixed constraint of 64K. Signed-off-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* IB/ehca: fix handling idr_alloc resultAndrzej Hajda2015-10-041-6/+7
| | | | | | | | | | | | | The function can return negative value. The problem has been detected using proposed semantic patch scripts/coccinelle/tests/unsigned_lesser_than_zero.cocci [1]. [1]: http://permalink.gmane.org/gmane.linux.kernel/2038576 Signed-off-by: Andrzej Hajda <a.hajda@samsung.com> Acked-by: Doug Ledford <dledford@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* RDMA/amso1100: use offset_in_page macroGeliang Tang2015-10-042-2/+2
| | | | | | | Use offset_in_page macro instead of (addr & ~PAGE_MASK). Signed-off-by: Geliang Tang <geliangtang@163.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* IB/ipath: use offset_in_page macroGeliang Tang2015-10-041-2/+2
| | | | | | | Use offset_in_page macro instead of (addr & ~PAGE_MASK). Signed-off-by: Geliang Tang <geliangtang@163.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* IB/hfi1: use offset_in_page macroGeliang Tang2015-10-041-4/+4
| | | | | | | Use offset_in_page macro instead of (addr & ~PAGE_MASK). Signed-off-by: Geliang Tang <geliangtang@163.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* android, lmk: Send SIGKILL before setting TIF_MEMDIE.Tetsuo Handa2015-10-041-8/+4
| | | | | | | | | | | | | | It was observed that setting TIF_MEMDIE before sending SIGKILL at oom_kill_process() allows memory reserves to be depleted by allocations which are not needed for terminating the OOM victim. This patch reverts commit 6bc2b856bb7c ("staging: android: lowmemorykiller: set TIF_MEMDIE before send kill sig"), for oom_kill_process() was updated to send SIGKILL before setting TIF_MEMDIE. Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Acked-by: Michal Hocko <mhocko@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: lustre: obdclass: Remove unused function obd_export_nid2strShraddha Barke2015-10-041-8/+0
| | | | | | | Remove obd_export_nid2str as it is defined but not used anymore. Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: comedi: 8255: prefer using the BIT macroH Hartley Sweeten2015-10-041-6/+6
| | | | | | | Fix the checkpatch.pl issues. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: lustre: obdclass: obd_mount: Declare as staticShraddha Barke2015-10-043-21/+12
| | | | | | | | | | | Declare lustre_fs_type, do_lcfg, lustre_fill_super, lustre_put_lsi, lustre_init_lsi, lustre_start_simple, server_name2index and server_name2fsname as static since they are used only in this particular file.Also remove corresponding declarations from header files. Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: lustre: obdclass: class_obd: Declare as staticShraddha Barke2015-10-041-1/+1
| | | | | | | | Declare obd_init_checks as static since it is used only in this particular file. Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: lustre: obdclass: genops: Declare as staticShraddha Barke2015-10-042-6/+2
| | | | | | | | | Declare obd_export_nid2str and obd_zombie_impexp_cull as static since they are used only in this particular file. Also remove the corresponding declarations from header file Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: lustre: ptlrpc: niobuf: Declare as staticShraddha Barke2015-10-042-3/+1
| | | | | | | | Declare ptlrpc_register_bulk as static since it is used only in this particular file.Also remove the declaration from header file Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: lustre: ptlrpc: layout: Declare as staticShraddha Barke2015-10-042-10/+4
| | | | | | | | | Declare req_capsule_init_area and req_capsule_field_present as static since they are used only in this particular file. Also remove the corresponding declarations from header files. Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: lustre: ptlrpc: pinger: Declare as staticShraddha Barke2015-10-041-2/+2
| | | | | | | | Declare ptlrpc_pinger_remove_timeouts as static since it is used only in this particular file. Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: lustre: ptlrpc: events: Declare as staticShraddha Barke2015-10-042-2/+1
| | | | | | | | Declare ptl_get_pid as static since it is used only in this particular file. Also remove declaration from corresponding header file Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: lustre: ptlrpc: nrs: Declare as staticShraddha Barke2015-10-042-7/+1
| | | | | | | | | Declare ptlrpc_nrs_policy_register as static since it is used only in this particular file. Also remove corresponding declaration from header files. Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: fsl-mc: remove references to dev_rootItai Katz2015-10-041-4/+0
| | | | | | | | | The dev_root field in the bus type struct has been replaced by a new mechanism to identify the root dprc. Remove all references to dev_root. Signed-off-by: Itai Katz <itai.katz@freescale.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: fsl-mc: add counter to track number of root DPRCsItai Katz2015-10-041-2/+11
| | | | | | | | | Add a counter to track the number of root DPRCs. When this counter is greater then 0 it means that at least one root DPRC device exists. Signed-off-by: Itai Katz <itai.katz@freescale.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: fsl-mc: add function to return pointer to root dprcItai Katz2015-10-041-4/+34
| | | | | | | | | | To support multiple root dprcs, instead of relying on the dev_root field of the bus type struct, instead create a function to traverse to the root dprc and return a pointer to the device struct Signed-off-by: Itai Katz <itai.katz@freescale.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: fsl-mc: abstract test for whether a dprc is a root dprcItai Katz2015-10-041-3/+13
| | | | | | | | | Instead of relying on assumptions about fields in data structures, abstract the test for whether a dprc is a root dprc into a function. Signed-off-by: Itai Katz <itai.katz@freescale.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: fsl-mc: abstract test for existence of fsl-mc busItai Katz2015-10-042-2/+13
| | | | | | | | | Add function to test for existence of an fsl-mc bus instance instead of doing this by looking directly at a field in the bus type struct. Signed-off-by: Itai Katz <itai.katz@freescale.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: vt6655: device_tx_srv rename pTDMalcolm Priestley2015-10-041-11/+11
| | | | | | | | Following the convention elsewhere for vnt_tx_desc rename desc. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: vt6655: device_main replace pTDInfo with td_info.Malcolm Priestley2015-10-041-8/+8
| | | | | | | Removing camel case. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: vt6655: device_main replace pRD with rd.Malcolm Priestley2015-10-041-16/+16
| | | | | | | Removing camel case. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: vt6655: device_alloc_rx_buf replace pRDInfo with rd_info.Malcolm Priestley2015-10-041-6/+6
| | | | | | | Removing camel case. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: vt6655: device_main.c replace pDesc with desc.Malcolm Priestley2015-10-041-40/+40
| | | | | | | Removing camel case. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: vt6655: device_main replace pDevice with priv.Malcolm Priestley2015-10-041-296/+292
| | | | | | | Removing camel case. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: unisys: visorinput: remove extraneous do_key functionTim Sell2015-10-041-12/+6
| | | | | | | | do_key() is no longer needed. Signed-off-by: Tim Sell <Timothy.Sell@unisys.com> Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: unisys: visorinput: remove extraneous mouse logicTim Sell2015-10-041-12/+0
| | | | | | | | Removes a cursor positioning hack that no longer seems to be required. Signed-off-by: Tim Sell <Timothy.Sell@unisys.com> Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: unisys: visorinput: register & use input_dev open() and close()Tim Sell2015-10-041-5/+50
| | | | | | | | | | Registration of visorinput_open() and visorinput_close() for each device allow us to eliminate unnecessary activity when nobody in user-land cares. Signed-off-by: Tim Sell <Timothy.Sell@unisys.com> Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: unisys: visorinput: change input bus type to BUS_VIRTUAL (6)Tim Sell2015-10-041-2/+2
| | | | | | | | | BUS_HOST wasn't really appropriate, so I changed to BUS_VIRTUAL, which is what virtio uses. Signed-off-by: Tim Sell <Timothy.Sell@unisys.com> Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: unisys: visorinput: comment tweaks - s/gizmo/input node/gTim Sell2015-10-041-3/+3
| | | | | | | | Just a simple search and replace in the comments. Signed-off-by: Tim Sell <Timothy.Sell@unisys.com> Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: unisys: visorinput: correct code comments per kernel conventionsTim Sell2015-10-041-18/+29
| | | | | | | | | | | | | | | Multi-line comments were modified to conform to kernel conventions: /* * multi-line * comments */ doc-test /** */ for some comments was removed. Signed-off-by: Tim Sell <Timothy.Sell@unisys.com> Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: unisys: visorinput: make structs & arrays const where possibleTim Sell2015-10-041-13/+29
| | | | | | | | | | | | | | | | | | This also gave me a warning with the assignment: visorinput_dev->keycode = visorkbd_keycode; because input_dev->keycode is NOT static but visorkbd_keycode now is, so I went ahead and also added logic to stash away non-static copies of visorkbd_keycode[] and visorkbd_ext_keycode[] within visorinput_devdata, and use the copy to assign to visorinput_dev->keycode. This change is also technically required, because user-space can remap keys, and we don't want this to be shared with the other keyboard devices running on the same system. Signed-off-by: Tim Sell <Timothy.Sell@unisys.com> Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: unisys: visorinput: re-order declarations for consistencyTim Sell2015-10-041-127/+115
| | | | | | | | | | | | | | | | | | In order to be more consistent with kernel conventions used elsewhere, I have re-ordered declarations in visorinput.c to follow this general order (where possible): * #defines * struct/enum/union declarations * static declarations (const if possible for all of them) * forward function declarations where absolutely necessary Exceptions were made for the static declarations like the driver declaration, given that it depends on previously-defined callbacks. So such declarations are at the end of visorinput.c. Signed-off-by: Tim Sell <Timothy.Sell@unisys.com> Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: unisys: visorinput: subsume .h files directly into visorinput.cTim Sell2015-10-043-67/+17
| | | | | | | | | keyboardchannel.h and mousechannel.h are now included within visorinput.c directly. Signed-off-by: Tim Sell <Timothy.Sell@unisys.com> Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: unisys: visorhid: rename to visorinputTim Sell2015-10-0411-75/+75
| | | | | | | | | | This visorhid driver provides a Human Interface Device, but is not at all using HID, the protocol. It's a plain input driver, so for clarity, it is being renamed to visorinput. Signed-off-by: Tim Sell <Timothy.Sell@unisys.com> Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: rdma: Fix braces around if/elseMartin Kletzander2015-10-047-36/+30
| | | | | | | Get rid of all ELSE_AFTER_BRACE type errors reported by checkpatch.pl. Signed-off-by: Martin Kletzander <mkletzan@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: wilc1000: remove blank lines before close braceChaehyun Lim2015-10-041-1/+0
| | | | | | | | | | This patch removes blank lines before close brace '}' CHECK: Blank lines aren't necessary before a close brace '}' drivers/staging/wilc1000/host_interface.c:5366: Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: wilc1000: rename s32Error in host_int_wait_msg_queue_idleChaehyun Lim2015-10-041-5/+5
| | | | | | | This patch replaces s32Error with result to avoid camelcase. Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: wilc1000: fix return type of host_int_wait_msg_queue_idleChaehyun Lim2015-10-042-3/+3
| | | | | | | | | | This patch changes return type of host_int_wait_msg_queue_idle from s32 to int. s32Error gets return value from wilc_mq_send that has return type of int. It should be changed return type of host_int_wait_msg_queue_idle by int as well as data type of s32Error. Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: wilc1000: rename hWFIDrv of host_int_set_mac_chnl_numChaehyun Lim2015-10-042-4/+4
| | | | | | | | This patch replaces hWFIDrv with wfi_drv that is first argument of host_int_set_mac_chnl_num to avoid camelcase. Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: wilc1000: rename u8ChNum of host_int_set_mac_chnl_numChaehyun Lim2015-10-042-3/+3
| | | | | | | | This patch replaces u8ChNum with channel that is second argument of host_int_set_mac_chnl_num to avoid camelcase. Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: wilc1000: rename s32Error in host_int_set_mac_chnl_numChaehyun Lim2015-10-041-5/+5
| | | | | | | This patch replaces s32Error with result to avoid camelcase. Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: wilc1000: fix NULL comparison styleChaehyun Lim2015-10-041-1/+1
| | | | | | | | | | | This patch changes NULL comparison style to use ! operator found by checkpatch.pl CHECK: Comparison to NULL could be written "!pstrWFIDrv" drivers/staging/wilc1000/host_interface.c:5324: Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: wilc1000: fix return type of host_int_set_mac_chnl_numChaehyun Lim2015-10-042-3/+3
| | | | | | | | | | | This patch changes return type of host_int_set_mac_chnl_num from s32 to int. s32Error gets return value from wilc_mq_send function that has return type of int. It should be changed return type of host_int_set_mac_chnl_num function by int as well as data type of s32Error. Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: most: Use module_platform_driverShraddha Barke2015-10-041-20/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use module_platform_driver for drivers whose init and exit functions only register and unregister, respectively. Thus remove some boilerplate code. A simplified version of Coccinelle patch - @a@ identifier f, x; @@ -static f(...) { return platform_driver_register(&x); } @b depends on a@ identifier e, a.x; @@ -static e(...) { platform_driver_unregister(&x); } @c depends on a && b@ identifier a.f; declarer name module_init; @@ -module_init(f); @d depends on a && b && c@ identifier b.e, a.x; declarer name module_exit; declarer name module_platform_driver; @@ -module_exit(e); +module_platform_driver(x); Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>