Commit Graph

482213 Commits

Author SHA1 Message Date
Benjamin Romer
74658c5621 staging: unisys: Fix CamelCase in Issue_VMCALL_IO_CONTROLVM_ADDR()
Fix CamelCase names:
Issue_VMCALL_IO_CONTROLVM_ADDR => issue_vmcall_io_controlvm_addr
ControlAddress => control_addr
ControlBytes => control_bytes

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02 09:49:28 -07:00
Benjamin Romer
03ec49dcda staging: unisys: fix CamelCase in uisctrl_register_req_handler
Fix CamelCase names:
chipset_driverInfo => chipset_driver_info

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02 09:49:18 -07:00
Benjamin Romer
eea94b3a3f staging: unisys: get rid of typedef for EVENT_PC
Just switch EVENT_PC over to enum event_pc.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02 09:47:28 -07:00
Benjamin Romer
765efdb917 staging: unisys: get rid of typedef for DRIVER_PC
Simply switch DRIVER_PC to enum driver_pc.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02 09:47:28 -07:00
Benjamin Romer
5ecf6d2a3b staging: unisys: remove doubled blank lines in guestlinuxdebug.h
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-02 09:47:28 -07:00
Benjamin Romer
534429dbb9 staging: unisys: fix CamelCase in bus_device_info_init()
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-02 09:47:28 -07:00
Benjamin Romer
a56db94c7e staging: unisys: fix copyright symbol in vbushelper.h
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-02 09:47:28 -07:00
Benjamin Romer
191126ac50 staging: unisys: fix line spacing in uniklog.h
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-02 09:47:28 -07:00
Benjamin Romer
d559f2cf4d staging: unisys: remove excess blank lines in uisthread.h
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-02 09:47:28 -07:00
Benjamin Romer
62dd4cf01a staging: unisys: fix up CamelCase in struct init_chipset_guestpart
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-02 09:47:28 -07:00
Benjamin Romer
8bd352ef0a staging: unisys: clean up CamelCase names in struct add_virt_guestpart
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-02 09:47:28 -07:00
Benjamin Romer
a990356d21 staging: unisys: fix CamelCase in struct del_vbus_guestpart
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-02 09:47:28 -07:00
Benjamin Romer
0014c3ccda staging: unisys: fix CamelCase definitions in struct io_msgs
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-02 09:47:25 -07:00
Benjamin Romer
7867499b13 staging: unisys: fix CamelCase names in del_virt_iopart
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-02 09:46:09 -07:00
Benjamin Romer
3af0c34f6b staging: unisys: fix CamelCase in del_vdisk_iopart
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-02 09:46:09 -07:00
Benjamin Romer
057546f02e staging: unisys: fix CamelCase names in struct add_vdisk_iopart
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-02 09:46:09 -07:00
Benjamin Romer
44589920d0 staging: unisys: clean up CamelCase in struct add_virt_iopart
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-02 09:46:09 -07:00
Benjamin Romer
c6d40f4258 staging: unisys: fix CamelCase struct name NetworkPolicy
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-02 09:45:01 -07:00
Benjamin Romer
059ec04b64 staging: unisys: clean up CamelCase in DEDICATED_SWITCH() macro
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-02 09:45:01 -07:00
Benjamin Romer
f796e84cc9 staging: unisys: fix CamelCase in struct device_info
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-02 09:43:43 -07:00
Benjamin Romer
c1e7229108 staging: unisys: remove uisqueue_send_int_if_needed()
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-02 09:43:40 -07:00
Benjamin Romer
21f8c6b845 staging: unisys: fix CamelCase in uisqueue_put_cmdrsp_with_lock_client
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-02 09:43:40 -07:00
Benjamin Romer
82dd8152ef staging: unisys: Clean up CamelCase in send_int_if_needed()
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-02 09:42:30 -07:00
Benjamin Romer
833c7255ce staging: unisys: fix CamelCase names in struct uisqueue_info
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-02 09:42:30 -07:00
Benjamin Romer
17f5e49167 staging: unisys: fix camelcase function uisqueue_InterlockedOr()
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-02 09:42:30 -07:00
Benjamin Romer
e3f3b1f2a0 staging: unisys: remove timskmodutils.h
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-02 09:42:30 -07:00
Benjamin Romer
69ee73aab0 staging: unisys: fix spacing in timskmod.h macro
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-02 09:42:30 -07:00
Benjamin Romer
132b8f9a35 staging: unisys: remove stray blank line in timskmod.h
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-02 09:42:30 -07:00
Benjamin Romer
fdee662e61 staging: unisys: remove unused locking functions in timskmod.h
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-02 09:42:30 -07:00
Benjamin Romer
2c5653b7de staging: unisys: remove typedef for PERIODIC_WORK
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-02 09:42:30 -07:00
Benjamin Romer
239436eb0f staging: unisys: delete extra blank lines in periodic_work.h
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-02 09:42:30 -07:00
Linus Torvalds
7575e4d56f Merge tag 'sound-3.17' of 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-02 09:42:28 -07:00
Chen Gang
f39100e121 drivers/staging/unisys: Let all IOMEM related modules depend on HAS_IOMEM
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-02 09:39:33 -07:00
Melike Yurtoglu
aff6de0519 staging: unisys: common-spar: Fix missing blank line warning
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-02 09:39:33 -07:00
Mahati Chamarthy
1cd36ed5b4 Staging: unisys: Add missing blank line
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-02 09:39:33 -07:00
Ebru Akagunduz
446393e960 staging: dgnc: Fix do not add new typedefs
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-02 09:37:44 -07:00
Yeliz Taneroglu
3fad9641ab staging: dgnc: Fix no spaces at the start of a line in dpacompat.h
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-02 09:37:44 -07:00
Mahati Chamarthy
0eaa02e66d Staging: dgnc: Add missing blank line
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-02 09:37:44 -07:00
Mahati Chamarthy
3c4019d3e0 Staging: dgnc: Remove unnecessary braces
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-02 09:37:44 -07:00
Mahati Chamarthy
c313fe2c34 Staging: dgnc: Remove return in void function
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-02 09:37:44 -07:00
Arnd Bergmann
372d5b5607 staging/lustre/lvfs: fix building without CONFIG_PROC_FS
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: fdedd94509 ("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-02 09:33:46 -07:00
Heena Sirwani
e31981a13d Staging: bcm: Removed unnecessary else.
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-02 09:33:46 -07:00
Mahati Chamarthy
50b47bbd43 Staging: media: omap24xx: Merge two lines and remove unused variable
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-02 09:33:46 -07:00
Simon Horman
07dcc686fa ipvs: Clean up comment style in ip_vs.h
* 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-02 18:30:58 +02:00
Pablo Neira Ayuso
4b7fd5d97e netfilter: explicit module dependency between br_netfilter and physdev
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-02 18:30:57 +02:00
Pablo Neira Ayuso
36d2af5998 netfilter: nf_tables: allow to filter from prerouting and postrouting
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-02 18:30:56 +02:00
Pablo Neira Ayuso
756c1b1a7f netfilter: nft_compat: remove incomplete 32/64 bits arch compat code
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-02 18:30:55 +02:00
Pablo Neira Ayuso
1b1bc49c0f netfilter: nf_tables: wait for call_rcu completion on module removal
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-02 18:30:54 +02:00
Pablo Neira Ayuso
1109a90c01 netfilter: use IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
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-02 18:30:54 +02:00
Pablo Neira Ayuso
c8d7b98bec netfilter: move nf_send_resetX() code to nf_reject_ipvX modules
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-02 18:30:49 +02:00