staging: iio: addac: remove unnecessary else

This fixes the checkpatch.pl warning:
WARNING: else is not generally useful after a break or return

Signed-off-by: Roxana Blaj <roxanagabriela10@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: octeon: Combined seperate strings.

This patch fixes "quoted string split across lines" checkpatch.pl
warning in ethernet-rx.c

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: octeon: Combined seperate strings.

This patch fixes "quoted string split across lines" checkpatch.pl
warning in ethernet-rgmii.c

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Staging: lustre: lnet: selftest: Made a function static.

The following patch makes a function static as it was not used by other
files.
The patch fixes the warning:
WARNING: symbol 'brw_fill_bulk' was not declared. Should it be
static?

The above warning was reported by sparse.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Staging: lustre: lnet: selftest: Made a function static.

The following patch makes a function static as it was not used by other
files.
The patch fixes the warning:
WARNING: symbol 'brw_check_page' was not declared. Should it be static?

The above warning was reported by sparse.

Signed-off-by: Heena Sirwani <heenasirwani@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Staging: lustre: lnet: selftest: Made a function static.

The following patch makes a function static as it was not used by other
files.
The patch fixes the warning:
WARNING: symbol 'brw_fill_page' was not declared. Should it be static?

The above warning was reported by sparse.

Signed-off-by: Heena Sirwani <heenasirwani@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Staging: lustre: lnet: selftest: Made a function static.

The following patch makes a function static as it is not used by other
files.
The patch fixes the following warning:
WARNING: symbol brw_inject_one_error was not declared. Should it be
static?

The above warning was reported by sparse.

Signed-off-by: Heena Sirwani <heenasirwani@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Staging: lustre: lnet: selftest: Made a function static.

The following patch makes a function static as it was not used by other
files.
The patch fixes the following warning:
WARNING: symbol brw_client_init was not declared. Should it be static?

The above warning was reported by sparse.

Signed-off-by: Heena Sirwani <heenasirwani@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Staging: lustre: lnet: selftest: Made a function static.

The following patch makes a function static as it was not used by other
files and not declared in the same file.
It fixes the following warning:
WARNING: symbol 'lstcon_init_acceptor_service' was not declared. Should
it be static?

The above warning was given by sparse.

Signed-off-by: Heena Sirwani <heenasirwani@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: lustre: include: linux: libcfs: linux: Removed line continuations.

This patch fixes "Avoid unnecessary line continuations" checkpatch.pl
warning in linux-time.h

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: lustre: include: linux: libcfs: Removed unnecessary else expression.

This patch fixes "else is not generally useful after a break or return"
checkpatch.pl warning libcfs.h

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: lustre: include: linux: libcfs: linux: Used "linux" instead of "asm".

This patch fixes "Use #include <linux/uaccess.h> instead of
<asm/uaccess.h"> checkpatch.pl warning in libcfs.h

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: lustre: lustre: obdclass: linux: include <linux/*.h> instead of <asm/*.h>

This patch fixes checpatch.pl warning in linux-module.c file.
WARNING: Use #include <linux/io.h> instead of <asm/io.h>
WARNING: Use #include <linux/poll.h> instead of <asm/poll.h>
WARNING: Use #include <linux/uaccess.h> instead of <asm/uaccess.h>

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: lustre: lnet: lnet: Remove space between function name and open paranthesis '('

This patch fixes checpatch.pl warning in api-ni.c file.
WARNING: space prohibited between function name and open parenthesis '('

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: lustre: lnet: lnet: Remove unnecessary else after return

This patch fixes checpatch.pl warning in acceptor.c file.
WARNING: else is not generally useful after a break or return

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: lustre: include: linux: libcfs: Remove spaces at the start of a line

This patch fixes checpatch.pl warning in file libcfs_cpu.h
WARNING: please, no spaces at the start of a line

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: lustre: include: linux: libcfs: Remove intialization of static to 0

This patch fixes checpatch.pl error in file libcfs_time.h
ERROR: do not initialise statics to 0 or NULL

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: lustre: include: linux: libcfs: use __packed instead of __attribute__((packed))

This patch fixes checpatch.pl warning in libcfs_debug.h file.
WARNING: __packed is preferred over __attribute__((packed))

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: unisys: Fix CamelCase in uislib_force_channel_interrupt()

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>

staging: unisys: Fix CamelCase in uislib_disable_channel_interrupts()

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>

staging: unisys: Fix CamelCase in uislib_enable_channel_interrupts()

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>

staging: unisys: Fix CamelCase in Issue_VMCALL_FATAL_BYE_BYE()

Fix Camelcase name:
Issue_VMCALL_FATAL_BYE_BYE => issue_vmcall_fatal

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: unisys: Fix CamelCase in Issue_VMCALL_CHANNEL_MISMATCH()

Fix CamelCase names:
Issue_VMCALL_CHANNEL_MISMATCH => issue_vmcall_channel_mismatch
ChannelName => chname
ItemName => item_name
SourceLineNumber => line_no

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: unisys: Fix CamelCase in Issue_VMCALL_UPDATE_PHYSICAL_TIME()

Fix CamelCase names:
Issue_VMCALL_UPDATE_PHYSICAL_TIME => issue_vmcall_update_physical_time

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: unisys: fix CamelCase in Issue_VMCALL_MEASUREMENT_DO_NOTHING()

Fix CamelCase names:
Issue_VMCALL_MEASUREMENT_DO_NOTHING =>
issue_vmcall_measurement_do_nothing

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: unisys: fix Issue_VMCALL_QUERY_GUEST_VIRTUAL_TIME_OFFSET()

Fix CamelCase names:
Issue_VMCALL_QUERY_GUEST_VIRTUAL_TIME_OFFSET =>
issue_vmcall_query_guest_virtual_time_offset

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: unisys: Fix CamelCase in Issue_VMCALL_IO_VISORSERIAL_ADDR()

Fix CamelCase names:
Issue_VMCALL_IO_VISORSERIAL_ADDR => issue_vmcall_io_visorserial_addr
DiagChannelAddress => channel_addr

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: unisys: Fix CamelCase Issue_VMCALL_IO_DIAG_ADDR()

Fix CamelCase names:
Issue_VMCALL_IO_DIAG_ADDR => issue_vmcall_io_diag_addr
DiagChannelAddress => diag_channel_addr

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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: 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>

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>

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>

Revert "staging: media: cxd2099: use usleep_range()"

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>

staging: r8192ee: Remove staging driver

A new version of this driver has been merged into the regular wireless tree.
The staging version is hereby removed.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: rtl8821ae: remove driver

There is now a "real" driver in the wireless tree for this hardware
device, so remove the staging driver as it is no longer needed.

Reported-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: et131x: Simplify for loop in et131x_init_send()

The for loop in this function increments two variables and has an unusual
starting index of 1 (not 0). Make it look more familiar.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: et131x: Audit and update comments

Many of the functions and variables in the driver have been renamed and are now
more understandable, as well as defines added for various constants. Update /
remove some comments to reflect this.

Also many comments were unnecessary dialogue describing what is evident
from the code, or comments were just plain incorrect. Remove these too.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: rtl8192u: ieee80211: Converted symbol to static.

This patch fixes this sparse warning:
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c:60:6: warning:
symbol 'ieee80211_ccmp_aes_encrypt' was not declared. Should it be static?

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: rtl8192u: Add blank line after variable declarations

Fix the following checkpatch.pl warning:
WARNING: Missing a blank line after declarations

Signed-off-by: Georgiana Chelu <georgiana.chelu93@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Staging: rtl8192e: Remove unused variable

This patch removes a variable which has never been used. The following
Coccinelle semantic patch was used to make this transformation:

@@
type T;
identifier i;
constant C;
@@

- T i;
  <... when != i
- i = C;
  ...>

Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: rtl8192u: Fixed trailing whitespace in copying

The following patch fixes the checkpatch.pl error:
ERROR: trailing whitespace

Signed-off-by: Esra Altintas <es.altintas@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: rtl8192u: remove space before close parenthesis ")"

This fixes the checkpatch.pl error:
ERROR: space prohibited before that close parenthesis ')'

Signed-off-by: Roxana Blaj <roxanagabriela10@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: rtl8192u: remove space before semicolon

This fixes the checkpatch.pl warning:
WARNING: space prohibited before semicolon

Signed-off-by: Roxana Blaj <roxanagabriela10@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: rtl8192u: add space after close brace '}'

This fixes the checkpatch.pl error:
ERROR: space required after that close brace '}'

Signed-off-by: Roxana Blaj <roxanagabriela10@gmail.com>
Acked-by: Daniel Baluta <daniel.baluta@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: slicoss: Fix void function return statements style warning

This fixes "void function return statements are not generally useful"
checkpatch.pl warning slicoss.c

Signed-off-by: Dilek Uzulmez <dilekuzulmez@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: rtl8192u: add space before the open parenthesis '('

This fixes the checkpatch.pl error:
ERROR: space required before the open parenthesis '('

Signed-off-by: Roxana Blaj <roxanagabriela10@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Staging: rtl8192e: rtl8192e: Remove assigned unused variable

This patch removes an initialized variable which has never been used.
The following Coccinelle semantic patch was used to make this transformation:

@e@
identifier i;
position p;
type T;
@@

extern T i@p;

@@
type T;
identifier i;
constant C;
position p != e.p;
@@

- T i@p;
  <+... when != i
- i = C;
  ...+>

The braces around if and else which become unnecessary after the transformation
were also removed.

Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: octeon: Fix missing blank line warning.

Fixes "Missing a blank line after declarations" checkpatch.pl warning in
ethernet-rgmii.c

Signed-off-by: Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: octeon: Removed unnecessary else expression.

This patch fixes "else is not generally useful after a break or return"
checkpatch.pl warning ethernet-util.h

Signed-off-by: Dilek Uzulmez <dilekuzulmez@gmail.com>
Acked-by: Daniel Baluta <daniel.baluta@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: octeon: Fix line 80 characters in ethernet.c

The following patch fixes the checpatch.pl warning:
WARNING: line over 80 characters

Signed-off-by: Esra Altintas <es.altintas@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers: staging: gdm72xx: Removed unnecessary braces.

This patch fixes "braces {} are not necessary for single statement
blocks" checkpatch.pl warning in netlink_k.c

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers: staging: gdm72xx: Removed unnecessary else expression.

This patch fixes "else is not generally useful after a break or return"
checkpatch.pl warning in netlink_k.c

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: gdm724x: Removed unnecessary else expression.

This patch fixes "else is not generally useful after a break or return"
checkpatch.pl warning in gdm_usb.c

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: ft1000: ft1000-pcmcia: Add require space after that ','

This patch fixes checkpatch.pl error in file ft1000_hw.c
ERROR: space required after that ';' (ctx:VxV)

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: ft1000: ft1000-pcmcia: Used "linux" instead of "asm".

This patch fixes "Use #include <linux/uaccess.h> instead of
<asm/uaccess.h" checkpatch.pl warning in ft1000_dnld.c

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: ft1000: ft1000-pcmcia: Removed unnecessary else expression.

This patch fixes "else is not generally useful after a break or return"
checkpatch.pl warning in ft1000_dnld.c

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Staging: unisys: common-spar: include: channels: Remove unnecessary semicolon

This fixes the checkpatch.pl warning:
WARNING: macros should not use a trailing semicolon.

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: vt6655: Merge three lines into one

This patch merges three lines into one, removing unecessary
if check.

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Reviewed-by: Himangi Saraogi <himangi774@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: vt6656: Merge three lines into one

This patch merges three lines into one, removing if branch

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: vt6655: Type conversion was made.

This patch fixes this sparse warning:
drivers/staging/vt6655/device_main.c:385:40: warning: mixing different enum types
drivers/staging/vt6655/device_main.c:385:40:     int enum _VIA_BB_TYPE versus
drivers/staging/vt6655/device_main.c:385:40:     int enum _VIA_PKT_TYPE

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Staging: vt6655: Add require space before that '('

This patch fixes checkpatch.pl error in file device_main.c
ERROR: space required before the open parenthesis '('

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Staging: vt6655: Add require space after that ','

This patch fixes checkpatch.pl error in file device_main.c
ERROR: space required after that ';' (ctx:VxV)

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>