summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-10-02staging: unisys: remove doubled blank lines in guestlinuxdebug.hBenjamin Romer
Take out those doubled blank lines in guestlinuxdebug.h. Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: unisys: fix CamelCase in bus_device_info_init()Benjamin Romer
Fix CamelCase names: BusDeviceInfo_Init => bus_device_info_init pBusDeviceInfo => bus_device_info_ptr deviceType => dev_type driverName => driver_name verTag => ver_tag Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: unisys: fix copyright symbol in vbushelper.hBenjamin Romer
The copyright character in vbushelper.h isn't UTF-8 - swap it out for a good, old-fashioned (C). Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: unisys: fix line spacing in uniklog.hBenjamin Romer
Take out the doubled blank lines in uniklog.h, too. Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: unisys: remove excess blank lines in uisthread.hBenjamin Romer
Take out those doubled blank lines in uisthread.h. Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: unisys: fix up CamelCase in struct init_chipset_guestpartBenjamin Romer
Fix up CamelCase names: busCount => bus_count switch_count => switch_count Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: unisys: clean up CamelCase names in struct add_virt_guestpartBenjamin Romer
Clean up CamelCase names: busNo => bus_no deviceNo => device_no devInstGuid => instance_uuid Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: unisys: fix CamelCase in struct del_vbus_guestpartBenjamin Romer
Fix up CamelCase names: busNo => bus_no Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: unisys: fix CamelCase definitions in struct io_msgsBenjamin Romer
Clean up CamelCase names: extPort => ext_port Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: unisys: fix CamelCase names in del_virt_iopartBenjamin Romer
Clean up CamelCase names: busNo => bus_no devNo => dev_no Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: unisys: fix CamelCase in del_vdisk_iopartBenjamin Romer
Fix CamelCase names: busNo => bus_no devNo => dev_no Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: unisys: fix CamelCase names in struct add_vdisk_iopartBenjamin Romer
Fix CamelCase names: busNo => bus_no devNo => dev_no Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: unisys: clean up CamelCase in struct add_virt_iopartBenjamin Romer
Clean up CamelCase names: guestHandle => guest_handle recvBusInterruptHandle => recv_bus_irq_handle useG2GCopy => use_g2g_copy Filler => filler busNo => bus_no dev_no => dev_no Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: unisys: fix CamelCase struct name NetworkPolicyBenjamin Romer
Clean up CamelCase name: NetworkPolicy => network_policy Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: unisys: clean up CamelCase in DEDICATED_SWITCH() macroBenjamin Romer
Clean up CamelCase names: pSwitch => s Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: unisys: fix CamelCase in struct device_infoBenjamin Romer
Clean up CamelCase names: channelAddr => channel_addr channelBytes => channel_bytes channelTypeGuid => channel_uuid devInstGuid => instance_uuid busNo => bus_no devNo => dev_no Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: unisys: remove uisqueue_send_int_if_needed()Benjamin Romer
This function is not used anywhere, so remove it. Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: unisys: fix CamelCase in uisqueue_put_cmdrsp_with_lock_clientBenjamin Romer
Clean up CamelCase names: issueInterruptIfEmpty => issue_irq_if_empty interruptHandle => irq_handle Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: unisys: Clean up CamelCase in send_int_if_needed()Benjamin Romer
Clean up CamelCase names: issueInterruptIfEmpty => issue_irq_if_empty interruptHandle => irq_handle Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: unisys: fix CamelCase names in struct uisqueue_infoBenjamin Romer
Clean up CamelCase names: Reserved1 => reserved1 Reserved2 => reserved2 Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: unisys: fix camelcase function uisqueue_InterlockedOr()Benjamin Romer
Clean up CamelCase names: uisqueue_InterlockedOr => uisqueue_interlocked_or Target => tgt Set => set Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: unisys: remove timskmodutils.hBenjamin Romer
Remove the entire timskmodutils.h file as it had a lot of checkpatch.pl strict warnings and checks, and nearly all of the functions were not used anywhere. The unisys_spar_platform variable was moved to timskmod.h. References to the removed timskmodutils.h were switched to timskmod.h instead. The unused visor_seq_file_new_buffer() and visor_seq_file_done_buffer() functions defined in timskmodutils.h were implemented in visorkmodutils.c, so these were removed as well. This patch will generate a warning about updating MAINTAINERS, but there does not seem to be any need for that. Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: unisys: fix spacing in timskmod.h macroBenjamin Romer
Adds in some missing spaces in the max macro in timskmod.h. Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: unisys: remove stray blank line in timskmod.hBenjamin Romer
Just cleaning up the extra blank line from here. Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: unisys: remove unused locking functions in timskmod.hBenjamin Romer
Delete a block of unused locking functions from timskmod.h. These functions generated a lot of checkpatch warnings and were not being used anyhow. Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: unisys: remove typedef for PERIODIC_WORKBenjamin Romer
In periodic_work.h, remove the typedef PERIODIC_WORK and replace it with struct periodic_work, and update functions used to manipulate the structure to use the new name. The functions used to manipulate the PERIODIC_WORK type are updated to use the fixed name, corrected for clarity, and changed to not use periodic_work as the parameter's name. Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: unisys: delete extra blank lines in periodic_work.hBenjamin Romer
Remove the extra blank lines from before the first comment. Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02Merge tag 'sound-3.17' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound Pull sound fixes from Takashi Iwai: "Just a few pending bits of random fixes in ASoC. Nothing exciting, but would be nice to be merged in 3.17, as most of them are also for stable kernels" * tag 'sound-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ASoC: ssm2602: do not hardcode type to SSM2602 ASoC: core: fix possible ZERO_SIZE_PTR pointer dereferencing error. MAINTAINERS: add atmel audio alsa driver maintainer entry ASoC: rt286: Fix sync function ASoC: rt286: Correct default value ASoC: soc-compress: fix double unlock of fe card mutex ASoC: fsl_ssi: fix kernel panic in probe function
2014-10-02drivers/staging/unisys: Let all IOMEM related modules depend on HAS_IOMEMChen Gang
UNISYS_UISLIB, UNISYS_VISORCHIPSET, and UNISYS_VISORUTIL need HAS_IOMEM, so depend on it. One of related error (with allmodconfig under um): CC [M] drivers/staging/unisys/uislib/uislib.o In file included from drivers/staging/unisys/uislib/uislib.c:34:0: drivers/staging/unisys/include/uisutils.h: In function ‘dbg_ioremap_cache’: drivers/staging/unisys/include/uisutils.h:88:2: error: implicit declaration of function ‘ioremap_cache’ [-Werror=implicit-function-declaration] new = ioremap_cache(addr, size); ^ drivers/staging/unisys/include/uisutils.h:88:6: warning: assignment makes pointer from integer without a cast [enabled by default] new = ioremap_cache(addr, size); ^ drivers/staging/unisys/include/uisutils.h: In function ‘dbg_ioremap’: drivers/staging/unisys/include/uisutils.h:99:2: error: implicit declaration of function ‘ioremap’ [-Werror=implicit-function-declaration] new = ioremap(addr, size); ^ drivers/staging/unisys/include/uisutils.h:99:6: warning: assignment makes pointer from integer without a cast [enabled by default] new = ioremap(addr, size); ^ drivers/staging/unisys/include/uisutils.h: In function ‘dbg_iounmap’: drivers/staging/unisys/include/uisutils.h:108:2: error: implicit declaration of function ‘iounmap’ [-Werror=implicit-function-declaration] iounmap(addr); ^ Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: unisys: common-spar: Fix missing blank line warningMelike Yurtoglu
Fixes "Missing a blank line after declarations" checkpatch.pl warning Signed-off-by: Melike Yurtoglu <aysemelikeyurtoglu@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02Staging: unisys: Add missing blank lineMahati Chamarthy
This fixes the following checkpatch.pl warning: WARNING: Missing a blank line after declarations Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com> Reviewed-by: Josh Triplett <josh@joshtriplett.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: dgnc: Fix do not add new typedefsEbru Akagunduz
This patch fixes "do not add new typedefs" checkpatch.pl warning in dgnc_types.h Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: dgnc: Fix no spaces at the start of a line in dpacompat.hYeliz Taneroglu
The following patch the checkpatch.pl warning: drivers/staging/dgnc/dpacompat.h:27 warning: please, no spaces at the start of a line Signed-off-by: Yeliz Taneroglu <yeliztaneroglu@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02Staging: dgnc: Add missing blank lineMahati Chamarthy
This fixes the following checkpatch.pl warning: WARNING: Missing a blank line after declarations Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02Staging: dgnc: Remove unnecessary bracesMahati Chamarthy
This fixes the following checkpatch.pl warnings: WARNING: braces {} are not necessary for single statement blocks Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02Staging: dgnc: Remove return in void functionMahati Chamarthy
This fixes the following checkpatch.pl warnings: WARNING: void function return statements are not generally useful Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging/lustre/lvfs: fix building without CONFIG_PROC_FSArnd Bergmann
Patch "staging/lustre/lvfs: remove the lvfs layer" moved some code around that was previously only built when CONFIG_PROC_FS was set, which now causes an invalid access to the obd_memory variable: ERROR: "obd_memory" [drivers/staging/lustre/lustre/obdclass/obdclass.ko] undefined! This fixes it by using adding a compile-time check around the access. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Fixes: fdedd94509fd ("staging/lustre/lvfs: remove the lvfs layer") Cc: James Simmons <uja.ornl@gmail.com> Cc: Mikhail Pershin <mike.pershin@intel.com> Cc: John L. Hammond <john.hammond@intel.com> Cc: Jian Yu <jian.yu@intel.com> Cc: Bob Glossman <bob.glossman@intel.com> Cc: Oleg Drokin <oleg.drokin@intel.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02Staging: bcm: Removed unnecessary else.Heena Sirwani
The following patch fixes the checkpatch.pl warning: WARNING: else is not generally useful after a break or return. Signed-off-by: Heena Sirwani <heenasirwani@gmail.com> Reviewed-by: Josh Triplett <josh@joshtriplett.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02Staging: media: omap24xx: Merge two lines and remove unused variableMahati Chamarthy
This patch merges two lines and removes a variable that becomes unused after merging. Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02ipvs: Clean up comment style in ip_vs.hSimon Horman
* Consistently use the multi-line comment style for networking code: /* This * That * The other thing */ * Use single-line comment style for comments with only one line of text. * In general follow the leading '*' of each line of a comment with a single space and then text. * Add missing line break between functions, remove double line break, align comments to previous lines whenever possible. Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
2014-10-02netfilter: explicit module dependency between br_netfilter and physdevPablo Neira Ayuso
You can use physdev to match the physical interface enslaved to the bridge device. This information is stored in skb->nf_bridge and it is set up by br_netfilter. So, this is only available when iptables is used from the bridge netfilter path. Since 34666d4 ("netfilter: bridge: move br_netfilter out of the core"), the br_netfilter code is modular. To reduce the impact of this change, we can autoload the br_netfilter if the physdev match is used since we assume that the users need br_netfilter in place. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
2014-10-02netfilter: nf_tables: allow to filter from prerouting and postroutingPablo Neira Ayuso
This allows us to emulate the NAT table in ebtables, which is actually a plain filter chain that hooks at prerouting, output and postrouting. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
2014-10-02netfilter: nft_compat: remove incomplete 32/64 bits arch compat codePablo Neira Ayuso
This code was based on the wrong asumption that you can probe based on the match/target private size that we get from userspace. This doesn't work at all when you have to dump the info back to userspace since you don't know what word size the userspace utility is using. Currently, the extensions that require arch compat are limit match and the ebt_mark match/target. The standard targets are not used by the nft-xt compat layer, so they are not affected. We can work around this limitation with a new revision that uses arch agnostic types. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
2014-10-02netfilter: nf_tables: wait for call_rcu completion on module removalPablo Neira Ayuso
Make sure the objects have been released before the nf_tables modules is removed. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
2014-10-02netfilter: use IS_ENABLED(CONFIG_BRIDGE_NETFILTER)Pablo Neira Ayuso
In 34666d4 ("netfilter: bridge: move br_netfilter out of the core"), the bridge netfilter code has been modularized. Use IS_ENABLED instead of ifdef to cover the module case. Fixes: 34666d4 ("netfilter: bridge: move br_netfilter out of the core") Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
2014-10-02netfilter: move nf_send_resetX() code to nf_reject_ipvX modulesPablo Neira Ayuso
Move nf_send_reset() and nf_send_reset6() to nf_reject_ipv4 and nf_reject_ipv6 respectively. This code is shared by x_tables and nf_tables. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
2014-10-02netfilter: nft_reject: introduce icmp code abstraction for inet and bridgePablo Neira Ayuso
This patch introduces the NFT_REJECT_ICMPX_UNREACH type which provides an abstraction to the ICMP and ICMPv6 codes that you can use from the inet and bridge tables, they are: * NFT_REJECT_ICMPX_NO_ROUTE: no route to host - network unreachable * NFT_REJECT_ICMPX_PORT_UNREACH: port unreachable * NFT_REJECT_ICMPX_HOST_UNREACH: host unreachable * NFT_REJECT_ICMPX_ADMIN_PROHIBITED: administratevely prohibited You can still use the specific codes when restricting the rule to match the corresponding layer 3 protocol. I decided to not overload the existing NFT_REJECT_ICMP_UNREACH to have different semantics depending on the table family and to allow the user to specify ICMP family specific codes if they restrict it to the corresponding family. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
2014-10-02Revert "staging: media: cxd2099: use usleep_range()"Greg Kroah-Hartman
This reverts commit 7b86477c0e5b7b1406f27da519d4df841f306b92. It was broken and broke the build :( Reported-by: kbuild test robot <fengguang.wu@intel.com> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Tapasweni Pathak <tapaswenipathak@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02arm64: Use phys_addr_t type for physical addressMin-Hua Chen
Change the type of physical address from unsigned long to phys_addr_t, make valid_phys_addr_range more readable. Signed-off-by: Min-Hua Chen <orca.chen@gmail.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
2014-10-02spi: dw-mid: follow new DMAengine workflowAndy Shevchenko
Though intel-mid-dma does not follow a new DMA workflow (*) let's prepare SPI DW driver for that. (*) The client is obliged to call dma_async_issue_pending() which starts the actual transfers. Old DMA drivers do not follow this, since requirement was introduced in the discussion of [1]. [1] http://www.spinics.net/lists/arm-kernel/msg125987.html Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>