openwrt/staging/blogic.git
10 years agoMerge branch 'staging-linus' into staging-work
Greg Kroah-Hartman [Sat, 8 Feb 2014 21:38:28 +0000 (13:38 -0800)]
Merge branch 'staging-linus' into staging-work

This is to pull in the lustre fixes so that others can continue to work
on updating the lustre codebase, as well as resolve some merge issues
with the ion and ocproto drivers to keep linux-next happy.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoMerge tag 'iio-fixes-for-3.14b' of git://git.kernel.org/pub/scm/linux/kernel/git...
Greg Kroah-Hartman [Sat, 8 Feb 2014 21:29:18 +0000 (13:29 -0800)]
Merge tag 'iio-fixes-for-3.14b' of git://git./linux/kernel/git/jic23/iio into staging-linus

Jonathan writes:

Second round of IIO fixes for the 3.14 cycle.

Another mixed bag, including some that were not in round 1 because
they applied to elements that went in during the merge window whereas
round 1 predated that.  I have been effectively out of action for 3 weeks
so will take a little while to catch up with my backlog.

* mag3110 - report busy in read_raw / write_raw when buffered capture
  is underway to avoid either changing the characteristics of the capture or
  causing capture issues by reading data destined for the buffer.
* mag3110 - fix a failure to specify leading zeros when formatting a decimal
  number.
* lradc - fix a buffer overflow and incorrect reporting of scale for voltage
  channel 15
* lradc - drop some scale_available attributes for elements that don't actually
  exist.  These could otherwise cause some interesting issues for userspace.
* ad799x - a typo in the events information mask resulted in some nasty crashes
  on failed probes.
* ak8975 - fix scale attribute output to avoid incorrect intepretation of
  readings in userspace.
* adis16400 - make sure the timestamp is the last element in all channel_spec
  arrays as this assumption is made by the buffer filling code, but was not
  true previously.
* bma180 - correctly use modifiers to distinguish the channels rather than
  indexes.  This brings the abi inline with the standard option for 3 axis
  accelerometers.
* max1363 - use devm_regulator_get_optional instead of the non optional case
  to allow the device to successfully probe when a regulator is not specified.

10 years agoiio: max1363: Use devm_regulator_get_optional for optional regulator
Guenter Roeck [Mon, 27 Jan 2014 18:10:00 +0000 (18:10 +0000)]
iio: max1363: Use devm_regulator_get_optional for optional regulator

In kernel version 3.13, devm_regulator_get() may return no error
if a regulator is undeclared. regulator_get_voltage() will return
-EINVAL if this happens. This causes the driver to fail loading if
the vref regulator is not declared.

Since vref is optional, call devm_regulator_get_optional instead.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Cc: Stable@vger.kernel.org
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
10 years agoiio:accel:bma180: Use modifier instead of index in channel specification
Peter Meerwald [Wed, 1 Oct 2014 20:37:00 +0000 (21:37 +0100)]
iio:accel:bma180: Use modifier instead of index in channel specification

This driver was not complying with the ABI and the purpose of this patch
is to bring it inline so that userspace will correctly identify the channels.

Should use channel modifiers (X/Y/Z), not channel indices
timestamp channel has scan index 3, not 4

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Cc: Kravchenko Oleksandr <x0199363@ti.com>
Cc: Stable@vger.kernel.org
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
10 years agoiio: adis16400: Set timestamp as the last element in chan_spec
Marcus Folkesson [Fri, 24 Jan 2014 11:24:00 +0000 (11:24 +0000)]
iio: adis16400: Set timestamp as the last element in chan_spec

This is necessary since timestamp is calculated as the last element
in iio_compute_scan_bytes().

Without this fix any userspace code reading the layout of the buffer via
sysfs will incorrectly interpret the data leading some nasty corruption.

Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Cc: stable@vger.kernel.org
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
10 years agoiio: ak8975: Fix calculation formula for convert micro tesla to gauss unit
Beomho Seo [Wed, 2 Apr 2014 08:15:00 +0000 (09:15 +0100)]
iio: ak8975: Fix calculation formula for convert micro tesla to gauss unit

This effects the reported scale of the raw values, and thus userspace
applications that use this value.

One micro tesla equal 0.01 gauss. So I have fixed calculation formula And add RAW_TO_GAUSS macro.
ASA is in the range of 0 to 255. If multiply 0.003, calculation result(in_magn_[*]_scale) is
always 0. So multiply 3000 and return and IIO_VAL_INT_PLUS_MICRO.
As a result, read_raw call back function return accurate scale value.

Signed-off-by: Beomho Seo <beomho.seo@samsung.com>
Cc: stable@vger.kernel.org
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
10 years agostaging:iio:ad799x fix typo in ad799x_events[]
Hartmut Knaack [Fri, 1 Aug 2014 23:07:00 +0000 (00:07 +0100)]
staging:iio:ad799x fix typo in ad799x_events[]

This patch fixes a typo in ad799x_events[], which caused the error "Failed to register event set".

Signed-off-by: Hartmut Knaack <knaack.h@gmx.de>
Cc: stable@vger.kernel.org
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
10 years agoiio: mxs-lradc: remove useless scale_available files
Alexandre Belloni [Mon, 13 Jan 2014 16:02:00 +0000 (16:02 +0000)]
iio: mxs-lradc: remove useless scale_available files

in_voltage8_scale_available and in_voltage9_scale_available are exposed to
userspace but useless as in_voltage8_raw and in_voltage9_raw are not available.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
10 years agoiio: mxs-lradc: fix buffer overflow
Alexandre Belloni [Mon, 13 Jan 2014 16:02:00 +0000 (16:02 +0000)]
iio: mxs-lradc: fix buffer overflow

Fixes:
drivers/staging/iio/adc/mxs-lradc.c:1556 mxs_lradc_probe() error: buffer
overflow 'iio->channels' 15 <= 15

The reported available scales for in_voltage15 were also wrong.

The realbits lookup is not necessary as all the channels of the LRADC have the
same resolution, use LRADC_RESOLUTION instead.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
10 years agoiio:magnetometer:mag3110: Fix output of decimal digits in show_int_plus_micros()
Peter Meerwald [Wed, 1 Oct 2014 20:59:00 +0000 (21:59 +0100)]
iio:magnetometer:mag3110: Fix output of decimal digits in show_int_plus_micros()

need to print leading zeros, hence "%d.%06d"

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
10 years agoiio:magnetometer:mag3110: Report busy in _read_raw() / write_raw() when buffer is...
Peter Meerwald [Wed, 1 Oct 2014 20:59:00 +0000 (21:59 +0100)]
iio:magnetometer:mag3110: Report busy in _read_raw() / write_raw() when buffer is enabled

individual reads are not permitted concurrently with buffered reads

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
10 years agowlags49_h2: Fix overflow in wireless_set_essid()
Maurizio Lombardi [Wed, 5 Feb 2014 15:46:56 +0000 (16:46 +0100)]
wlags49_h2: Fix overflow in wireless_set_essid()

This patch prevents the wireless_set_essid() function from overwriting
the last byte of the NetworkName buffer which must be NULL.

Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoxlr_net: Fix missing trivial allocation check
Alan Cox [Wed, 5 Feb 2014 11:56:43 +0000 (11:56 +0000)]
xlr_net: Fix missing trivial allocation check

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: r8188eu: overflow in rtw_p2p_get_go_device_address()
Dan Carpenter [Mon, 3 Feb 2014 22:38:35 +0000 (01:38 +0300)]
staging: r8188eu: overflow in rtw_p2p_get_go_device_address()

The go_devadd_str[] array is two characters too small to hold the
address so we corrupt memory.

I've changed the user space API slightly and I don't have a way to test
if this breaks anything.  In the original code we truncated away the
last digit of the address and the NUL terminator so it was already a bit
broken.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: r8188eu: array overflow in rtw_mp_ioctl_hdl()
Dan Carpenter [Mon, 3 Feb 2014 22:38:03 +0000 (01:38 +0300)]
staging: r8188eu: array overflow in rtw_mp_ioctl_hdl()

MAX_MP_IOCTL_SUBCODE (35) and mp_ioctl_hdl (32 elements) are no longer
in sync.  It leads to a bogus pointer dereference.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: r8188eu: Fix typo in USB_DEVICE list
Larry Finger [Mon, 3 Feb 2014 04:23:06 +0000 (22:23 -0600)]
staging: r8188eu: Fix typo in USB_DEVICE list

There is a typo in the device list that interchanges the vendor and
product codes for one of the entries. This exchange was determined
by noticing that the vendor code is 0x07b8 for Abocom at
http://www.linux-usb.org/usb.ids.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agousbip/userspace/libsrc/names.c: memory leak
Heinrich Schuchardt [Tue, 28 Jan 2014 20:16:46 +0000 (21:16 +0100)]
usbip/userspace/libsrc/names.c: memory leak

revised patch

p is freed if NULL.
p is leaked if second calloc fails.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agogpu: ion: dereferencing an ERR_PTR
Dan Carpenter [Wed, 22 Jan 2014 14:20:03 +0000 (17:20 +0300)]
gpu: ion: dereferencing an ERR_PTR

We dereference "heap->task" before checking if it's an ERR_PTR.

Fixes: ea313b5f88ed ('gpu: ion: Also shrink memory cached in the deferred free list')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: usbduxsigma: fix unaligned dereferences
Ian Abbott [Tue, 21 Jan 2014 17:39:05 +0000 (17:39 +0000)]
staging: comedi: usbduxsigma: fix unaligned dereferences

There are a couple of dereferences such as `*(uint32_t
*)(devpriv->insn_buf + 1)` that are unaligned as `devpriv->insn_buf` is
of type `uint8_t *`.  This works on x86 architecture but may not be
supported on other architectures.  Call `get_unalign()` to perform the
unaligned dereferences.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Cc: Bernd Porr <mail@berndporr.me.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: fix too early cleanup in comedi_auto_config()
Ian Abbott [Tue, 21 Jan 2014 17:06:34 +0000 (17:06 +0000)]
staging: comedi: fix too early cleanup in comedi_auto_config()

`comedi_auto_config()` is usually called from the probe routine of a
low-level comedi driver to allocate and auto-configure a comedi device.
Part of this involves calling the low-level driver's `auto_attach()`
handler, and if that is successful, `comedi_device_postconfig()` tries
to complete the configuration of the comedi device.  If either of those
fail, `comedi_device_detach()` is called to clean up, and
`comedi_release_hardware_device()` is called to remove the dynamically
allocated comedi device.

Unfortunately, `comedi_device_detach()` clears the `hw_dev` member of
the `struct comedi_device` (indirectly via `comedi_clear_hw_dev()`), and
that stops `comedi_release_hardware_device()` finding the comedi device
associated with the hardware device, so the comedi device won't be
removed properly.

Since `comedi_release_hardware_device()` also calls
`comedi_device_detach()` (assuming it finds the comedi device associated
with the hardware device), the fix is to remove the direct call to
`comedi_device_detach()` from `comedi_auto_config()` and let the call to
`comedi_release_hardware_device()` take care of it.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: android: ion: dummy: fix an error code
Dan Carpenter [Mon, 20 Jan 2014 10:30:01 +0000 (13:30 +0300)]
staging: android: ion: dummy: fix an error code

We should be returning -ENOMEM here instead of zero.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: ozwpan: Change kmalloc() to kzalloc()
Salym Senyonga [Sat, 25 Jan 2014 09:54:41 +0000 (12:54 +0300)]
Staging: ozwpan: Change kmalloc() to kzalloc()

changing to kzalloc lets us get rid of some lines. The other concern
here is that some members of binding->ptype are still uninitialized at
the end of the function.

Signed-off-by: Salym Senyonga <salymsash@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: ozwpan: reduce indent levels in oz_binding_add().
Salym Senyonga [Sat, 25 Jan 2014 09:54:40 +0000 (12:54 +0300)]
Staging: ozwpan: reduce indent levels in oz_binding_add().

When hit error then we can return immediately. This makes the code
simpler and lets us remove some indenting.

Signed-off-by: Salym Senyonga <salymsash@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: ozwpan: Fix null dereference
Salym Senyonga [Sat, 25 Jan 2014 09:54:39 +0000 (12:54 +0300)]
Staging: ozwpan: Fix null dereference

If net_dev is NULL memcpy() will Oops.

Signed-off-by: Salym Senyonga <salymsash@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging/usbip: userspace to use linux header for usb_device_speed enum, missing speed...
Shuah Khan [Fri, 24 Jan 2014 18:34:13 +0000 (11:34 -0700)]
staging/usbip: userspace to use linux header for usb_device_speed enum, missing speeds to speed_strings array

Remove usb_device_speed enum define from usbip_common.h and change it to
include linux/usb/ch9.h instead. Add speed strings for usb wireless and 3.0
to speed_strings array.

Signed-off-by: Shuah Khan <shuah.kh@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging/usbip: simplify usbip_dump_usb_device() udev->speed handling
Shuah Khan [Fri, 24 Jan 2014 16:25:05 +0000 (09:25 -0700)]
staging/usbip: simplify usbip_dump_usb_device() udev->speed handling

Change usbip_dump_usb_device() to use usb_speed_string() and remove the
code that does switch on udev->speed and builds custom speed strings.

Signed-off-by: Shuah Khan <shuah.kh@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: usbip: convert usbip-host driver to usb_device_driver
Valentina Manea [Thu, 23 Jan 2014 21:12:29 +0000 (23:12 +0200)]
staging: usbip: convert usbip-host driver to usb_device_driver

This driver was previously an interface driver. Since USB/IP
exports a whole device, not just an interface, it would make
sense to be a device driver.

This patch also modifies the way userspace sees and uses a
shared device:

* the usbip_status file is no longer created for interface 0, but for
the whole device (such as
/sys/devices/pci0000:00/0000:00:01.2/usb1/1-1/usbip_status).
* per interface information, such as interface class or protocol, is
no longer sent/received; only device specific information is
transmitted.
* since the driver was moved one level below in the USB architecture,
there is no need to bind/unbind each interface, just the device as a
whole.

Signed-off-by: Valentina Manea <valentina.manea.m@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging/usbip: Change vhci_hcd store_attach() device information message to include...
Shuah Khan [Wed, 22 Jan 2014 21:24:29 +0000 (14:24 -0700)]
staging/usbip: Change vhci_hcd store_attach() device information message to include speed string

Change vhci_hcd store_attach() routine to include speed string in its device
information message. The current call to dev_info() prints out speed number
which is the enum number. Change to call usb_speed_string() to print speed
string in addition to the number.

Signed-off-by: Shuah Khan <shuah.kh@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging/usbip: remove vhci_hcd vhci_hub_status change message
Shuah Khan [Tue, 21 Jan 2014 19:18:34 +0000 (12:18 -0700)]
staging/usbip: remove vhci_hcd vhci_hub_status change message

When vhci_hcd is enabled, the following message floods the dmesg buffer.
This message doesn't provide any useful information other than cluttering
the dmesg buffer. Fix it by removing the message. There is another debug
message in this routine that dumps detailed port status change information.

[ 4062.716662] vhci_hcd: changed 0

Signed-off-by: Shuah Khan <shuah.kh@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: drivers: return '0' for successful attach
H Hartley Sweeten [Mon, 3 Feb 2014 18:26:51 +0000 (11:26 -0700)]
staging: comedi: drivers: return '0' for successful attach

The comedi core expects the driver attach functions to return a
negative errno for failure. Any other value indicates success.

For consistency in the drivers, make sure they all return '0' to
indicate success.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: drivers: remove final 'attach' messages
H Hartley Sweeten [Mon, 3 Feb 2014 18:26:50 +0000 (11:26 -0700)]
staging: comedi: drivers: remove final 'attach' messages

These messages are just added noise. Remove them.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: amplc_pci230: standardize error handling of subdev_8255_init()
H Hartley Sweeten [Mon, 3 Feb 2014 17:43:27 +0000 (10:43 -0700)]
staging: comedi: amplc_pci230: standardize error handling of subdev_8255_init()

The subdev_8255_init() call returns 0 for success of a negative errno for failure.
For aesthetics, change the error test in this driver from (rc < 0) to simply (rc)
to follow the style of the other users of this function.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: amplc_pc236: remove dev_err() message due to allocation failure
H Hartley Sweeten [Mon, 3 Feb 2014 17:43:26 +0000 (10:43 -0700)]
staging: comedi: amplc_pc236: remove dev_err() message due to allocation failure

The subdev_8255_init() call can only fail due to the allocation of the private
data. This failure will alreay have produced an error message. Remove the
redundant dev_err().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: drivers: propogate errno from subdev_8255_init()
H Hartley Sweeten [Mon, 3 Feb 2014 17:43:25 +0000 (10:43 -0700)]
staging: comedi: drivers: propogate errno from subdev_8255_init()

The initialization of the 8255 subdevice can fail due to the allocation
of the private data. Make sure all callers of subdev_8255_init() propogate
the errno.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: r8188eu: Remove ODM_InitializeTimer
Larry Finger [Fri, 7 Feb 2014 02:45:47 +0000 (20:45 -0600)]
staging: r8188eu: Remove ODM_InitializeTimer

This wrapper is not used.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: r8188eu: Remove ODM_SetTimer
Larry Finger [Fri, 7 Feb 2014 02:45:46 +0000 (20:45 -0600)]
staging: r8188eu: Remove ODM_SetTimer

This wrapper is not used.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: r8188eu: Remove ODM_CompareMemory
Larry Finger [Fri, 7 Feb 2014 02:45:45 +0000 (20:45 -0600)]
staging: r8188eu: Remove ODM_CompareMemory

This routine is a wrapper for _rtw_memcmp(), which is a wrapper for memcmp.
In a later change, _rtw_memcmp will be removed.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: r8188eu: Remove ODM_AllocateMemory
Larry Finger [Fri, 7 Feb 2014 02:45:44 +0000 (20:45 -0600)]
staging: r8188eu: Remove ODM_AllocateMemory

This wrapper for vzalloc() is not used.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: r8188eu: Remove wrappers around vfree
Larry Finger [Fri, 7 Feb 2014 02:45:43 +0000 (20:45 -0600)]
staging: r8188eu: Remove wrappers around vfree

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: r8188eu: Remove wrappers around vmalloc and vzalloc
Larry Finger [Fri, 7 Feb 2014 02:45:42 +0000 (20:45 -0600)]
staging: r8188eu: Remove wrappers around vmalloc and vzalloc

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: r8188eu: Remove ODM_Write4Byte
Larry Finger [Fri, 7 Feb 2014 02:45:41 +0000 (20:45 -0600)]
staging: r8188eu: Remove ODM_Write4Byte

This routine is the equivalent of rtw_write32.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: r8188eu: Remove ODM_Write2Byte
Larry Finger [Fri, 7 Feb 2014 02:45:40 +0000 (20:45 -0600)]
staging: r8188eu: Remove ODM_Write2Byte

This routine is the equivalent of rtw_write16.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: r8188eu: Remove ODM_Write1Byte
Larry Finger [Fri, 7 Feb 2014 02:45:39 +0000 (20:45 -0600)]
staging: r8188eu: Remove ODM_Write1Byte

This routine is the equivalent of rtl_write6.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: r8188eu: Remove ODM_Read4Byte
Larry Finger [Fri, 7 Feb 2014 02:45:38 +0000 (20:45 -0600)]
staging: r8188eu: Remove ODM_Read4Byte

This routine is essentially a duplicate of rtw_read32.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: r8188eu: Remove ODM_Read2Byte
Larry Finger [Fri, 7 Feb 2014 02:45:37 +0000 (20:45 -0600)]
staging: r8188eu: Remove ODM_Read2Byte

This routine is never used.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: r8188eu: Remove ODM_Read1Byte
Larry Finger [Fri, 7 Feb 2014 02:45:36 +0000 (20:45 -0600)]
staging: r8188eu: Remove ODM_Read1Byte

This is essentially a synonym for rtw_read8.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: cxt1e1: remove unnecessary function, VMETRO_TRACE
SeongJae Park [Tue, 4 Feb 2014 08:36:39 +0000 (17:36 +0900)]
staging: cxt1e1: remove unnecessary function, VMETRO_TRACE

VMETRO_TRACE isn't called from anywhere. So delete it.

Signed-off-by: SeongJae Park <sj38.park@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: et131x: remove spinlock adapter->lock
Zhao, Gang [Wed, 5 Feb 2014 16:10:35 +0000 (00:10 +0800)]
staging: et131x: remove spinlock adapter->lock

adapter->lock is only used in et131x_multicast(), which is eventually
called by network stack function __dev_set_rx_mode(). __dev_set_rx_mode()
is always called by (net_device *)dev->addr_list_lock hold, to protect from
concurrent access. So adapter->lock is redundant.

Signed-off-by: Zhao, Gang <gamerh2o@gmail.com>
Acked-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: et131x: stop read when hit max delay in et131x_phy_mii_read
Zhao, Gang [Wed, 5 Feb 2014 16:10:34 +0000 (00:10 +0800)]
staging: et131x: stop read when hit max delay in et131x_phy_mii_read

stop read and return error when hit max delay time.

Signed-off-by: Zhao, Gang <gamerh2o@gmail.com>
Acked-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoimx-drm: imx-hdmi: Remove parentheses from returns
Fabio Estevam [Thu, 6 Feb 2014 12:12:03 +0000 (10:12 -0200)]
imx-drm: imx-hdmi: Remove parentheses from returns

Fix the following checkpatch warnings:

ERROR: return is not a function, parentheses are not required
#462: FILE: drivers/staging/imx-drm/imx-hdmi.c:462:
+       return (hdmi->hdmi_data.enc_in_format !=

ERROR: return is not a function, parentheses are not required
#468: FILE: drivers/staging/imx-drm/imx-hdmi.c:468:
+       return ((hdmi->hdmi_data.enc_out_format == YCBCR422_8BITS) &&

ERROR: return is not a function, parentheses are not required
#475: FILE: drivers/staging/imx-drm/imx-hdmi.c:475:
+       return ((hdmi->hdmi_data.enc_in_format == YCBCR422_8BITS) &&

While at it, broke the return code from is_color_space_decimation() and
is_color_space_interpolation() for better readability

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8812ae: replace strict_strtoul() with kstrtoul()
Jingoo Han [Wed, 5 Feb 2014 02:49:36 +0000 (11:49 +0900)]
Staging: rtl8812ae: replace strict_strtoul() with kstrtoul()

The usage of strict_strtoul() is not preferred, because
strict_strtoul() is obsolete. Thus, kstrtoul() should be
used.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8192u: remove unused files
Dave Hansen [Mon, 3 Feb 2014 22:40:25 +0000 (14:40 -0800)]
staging: rtl8192u: remove unused files

I was doing some code audits looking at scattergather uses, and noticed
that update() in drivers/staging/rtl8192u/ieee80211/digest.c uses
sg.page which doesn't exist any longer, so this can't possibly compile.

Turns out that digest.c is actually unused.  It doesn't get referenced
in a Makefile or get compiled and doesn't get used as far as I can see.
I then widened the search to all the files in the directory.  There are
a *bunch* that look unused.  I removed all of them, then added them
back one at a time until the driver compiled again.

Signed-off-by: Dave Hansen <dave.hansen@intel.com>
Cc: jerry-chuang@realtek.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: olpc_dcon: Trivial: Remove space before indentation.
Gary Servin [Sun, 26 Jan 2014 16:00:18 +0000 (13:00 -0300)]
staging: olpc_dcon: Trivial: Remove space before indentation.

This coding style error was detected using the checkpatch.pl script

Signed-off-by: Gary Servin <garyservin@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ion: Use PTR_ERR_OR_ZERO
Sachin Kamat [Mon, 27 Jan 2014 06:47:05 +0000 (12:17 +0530)]
staging: ion: Use PTR_ERR_OR_ZERO

PTR_RET is deprecated. Use PTR_ERR_OR_ZERO instead.
While at it also use PTR_ERR_OR_ZERO in ion.c to simplify
the code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging:rtl8821ae: trailing whitespace cleanup in pci.c
Gokulnath A [Thu, 6 Feb 2014 19:15:22 +0000 (00:45 +0530)]
staging:rtl8821ae: trailing whitespace cleanup in pci.c

Fixed all the trailing whitespace errors found by checkpatch.pl script

Signed-off-by: Gokulnath A <Gokulnath.Avanashilingam@in.bosch.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8821ae: a couple macro expansion bugs
Dan Carpenter [Tue, 28 Jan 2014 14:00:52 +0000 (17:00 +0300)]
staging: rtl8821ae: a couple macro expansion bugs

These macros need parentheses, otherwise it causes a macro expansion bug
when they are used like this:

ch->flags &= ~IEEE80211_CHAN_NO_IBSS;

This was found using Smatch:
drivers/staging/rtl8821ae/regd.c:200 _rtl_reg_apply_beaconing_flags()
warn: the 'IEEE80211_CHAN_NO_IBSS' macro might need parens

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8821ae: fix up some spacing issues.
Gary Rookard [Sat, 25 Jan 2014 09:03:14 +0000 (04:03 -0500)]
Staging: rtl8821ae: fix up some spacing issues.

I fixed up some operator spacing issues, and other
minor spacing issues.

Signed-off-by: Gary Alan Rookard <garyrookard@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agodrivers: staging: Mark functions as static and remove unused function in bpctl_mod.c
Rashika Kheria [Thu, 23 Jan 2014 22:44:00 +0000 (04:14 +0530)]
drivers: staging: Mark functions as static and remove unused function in bpctl_mod.c

Mark functions as static in bpctl_mod.c because they are not used
outside this file. Remove unused function from bpctl_mod.c.

This also eliminates the following warnings from bpctl_mod.c:
drivers/staging/silicom/bpctl_mod.c:1507:6: warning: no previous prototype for ‘send_bypass_clear_pulse’ [-Wmissing-prototypes]
drivers/staging/silicom/bpctl_mod.c:1762:5: warning: no previous prototype for ‘cmnd_on’ [-Wmissing-prototypes]
drivers/staging/silicom/bpctl_mod.c:1779:5: warning: no previous prototype for ‘cmnd_off’ [-Wmissing-prototypes]

...

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: cxt1e1: cleanup mfg_template[] a bit
Dan Carpenter [Thu, 23 Jan 2014 08:24:27 +0000 (11:24 +0300)]
staging: cxt1e1: cleanup mfg_template[] a bit

1) Make it static.
2) Change it to u8 data instead of short.
3) This means we can memcpy() it to the correct location instead of
   using a for loop.
4) With memcpy() we can use the union member we want directly instead of
   copying to the generic .bytes union member.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging/bluetooth: Add hci_h4p driver
Pavel Machek [Tue, 21 Jan 2014 20:56:27 +0000 (21:56 +0100)]
staging/bluetooth: Add hci_h4p driver

Add hci_h4p bluetooth driver to staging tree. This device is used
for example on Nokia N900 cell phone.

Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
Signed-off-by: Pavel Machek <pavel@ucw.cz>
Thanks-to: Sebastian Reichel <sre@debian.org>
Thanks-to: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: fix indentation in if statement
Greg Kroah-Hartman [Fri, 7 Feb 2014 18:10:34 +0000 (10:10 -0800)]
staging: vt6656: fix indentation in if statement

Dave Jones pointed out that commit
302433daf47aeb7d21d66e55fb84d6a8fffd4aed (staging: vt6656: device.h
Remove typedef enum __device_init_type.), improperly indented a line to
make it look like it was under the if line above it, but it wasn't.

So fix this up.

Reported-by: Dave Jones <davej@redhat.com>
Cc: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: fpgaboot: Xilinx FPGA firmware download driver
Insop Song [Tue, 21 Jan 2014 07:47:06 +0000 (23:47 -0800)]
staging: fpgaboot: Xilinx FPGA firmware download driver

This driver downloads Xilinx FPGA firmware using gpio pins.
It loads Xilinx FPGA bitstream format firmware image and
program the Xilinx FPGA using SelectMAP (parallel) mode.

Signed-off-by: Insop Song <insop.song@gainspeed.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: bcm: DDRInit: fix up spacing issues.
Gary Rookard [Sat, 18 Jan 2014 22:05:09 +0000 (17:05 -0500)]
Staging: bcm: DDRInit: fix up spacing issues.

I fixed up some operator spacing issues.

Signed-off-by: Gary Alan Rookard <garyrookard@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: crystalhd: remove unnecessary parenthesis
SeongJae Park [Sat, 18 Jan 2014 07:28:24 +0000 (16:28 +0900)]
staging: crystalhd: remove unnecessary parenthesis

Signed-off-by: SeongJae Park <sj38.park@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: crystalhd: enclose multi statements macro
SeongJae Park [Sat, 18 Jan 2014 07:28:23 +0000 (16:28 +0900)]
staging: crystalhd: enclose multi statements macro

Enclose multiple statements macro with do - while block.

Signed-off-by: SeongJae Park <sj38.park@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: dgap: removes version.h dependency
Lidza Louina [Fri, 17 Jan 2014 16:01:37 +0000 (11:01 -0500)]
staging: dgap: removes version.h dependency

This patch removes the version.h dependencies to the
driver.h, fep5.c and tty.c files. This header was used
to help the driver support different versions of the
kernel. The support for different versions was removed
in a previous patch.

Signed-off-by: Lidza Louina <Lidza.Louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: dgap: removes KERNEL_VERSION conditionals
Lidza Louina [Fri, 17 Jan 2014 16:01:36 +0000 (11:01 -0500)]
staging: dgap: removes KERNEL_VERSION conditionals

This patch removes the KERNEL_VERSION conditionals.
The driver is built for this kernel version, so the
conditionals are not needed.

Signed-off-by: Lidza Louina <Lidza.Louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: dgap: Fix trailing whitespace in dgap_fep5.h
Masanari Iida [Tue, 14 Jan 2014 15:40:48 +0000 (00:40 +0900)]
staging: dgap: Fix trailing whitespace in dgap_fep5.h

This patch fixed trailing whitespace found by checkpatch.pl
in staging/dgap/dgap_fep5.h

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Acked-by: Lidza Louina <Lidza.Louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: dgap: Fix trailing whitespace in dgap_sysfs.h
Masanari Iida [Tue, 14 Jan 2014 15:40:47 +0000 (00:40 +0900)]
staging: dgap: Fix trailing whitespace in dgap_sysfs.h

This patch fixed trailing whitespace found by checkpatch.pl
in staging/dgap/dgap_sysfs.h

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Acked-by: Lidza Louina <Lidza.Louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: dgap: Fix trailing whitespace in dgap_driver.h
Masanari Iida [Tue, 14 Jan 2014 15:40:46 +0000 (00:40 +0900)]
staging: dgap: Fix trailing whitespace in dgap_driver.h

This patch fixed trailing whitespace found by checkpatch.pl
in staging/dgap/dgap_driver.h

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Acked-by: Lidza Louina <Lidza.Louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: dgap: Fix trailing whitespace in dgap_downld.h
Masanari Iida [Tue, 14 Jan 2014 15:40:45 +0000 (00:40 +0900)]
staging: dgap: Fix trailing whitespace in dgap_downld.h

This patch fixed trailing whitespace found by checkpatch.pl
in staging/dgap/dgap_downld.h

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Acked-by: Lidza Louina <Lidza.Louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: dgap: Fix trailing whitespace in dgap_driver.c
Masanari Iida [Tue, 14 Jan 2014 15:40:44 +0000 (00:40 +0900)]
staging: dgap: Fix trailing whitespace in dgap_driver.c

This patch fixed trailing whitespace found by
checkpatch.pl in staging/dgap/dgap_driver.c

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Acked-by: Lidza Louina <Lidza.Louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: dgap: Fix trailing whitespace in dgap_parse.c
Masanari Iida [Tue, 14 Jan 2014 15:40:43 +0000 (00:40 +0900)]
staging: dgap: Fix trailing whitespace in dgap_parse.c

Thsi patch fixed trailing whitespace found by checkpatch.pl
in dgap/dgap_parse.c

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Acked-by: Lidza Louina <Lidza.Louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: dgap: Fix trailing whitespace in dgap_sysfs.c
Masanari Iida [Tue, 14 Jan 2014 15:40:42 +0000 (00:40 +0900)]
staging: dgap: Fix trailing whitespace in dgap_sysfs.c

This patch fixed trailing whitespace found by checkpatch.pl
in dgap/dgap_sysfs.c

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Acked-by: Lidza Louina <Lidza.Louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: dgap: Fix trailing whitespace in digi.h
Masanari Iida [Tue, 14 Jan 2014 15:40:41 +0000 (00:40 +0900)]
staging: dgap: Fix trailing whitespace in digi.h

This patch fixed trailing whitespace error found by
checkpatch.pl in dgap/digi.h

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Acked-by: Lidza Louina <Lidza.Louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: comedi: convert while loop to timeout in ni_mio_common.c
Chase Southwood [Thu, 16 Jan 2014 18:27:29 +0000 (12:27 -0600)]
Staging: comedi: convert while loop to timeout in ni_mio_common.c

This patch for ni_mio_common.c changes out a while loop for a timeout,
which is preferred.

Signed-off-by: Chase Southwood <chase.southwood@yahoo.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: comedi: remove unnecessary braces in pcl711.c
Chase Southwood [Tue, 14 Jan 2014 03:13:16 +0000 (21:13 -0600)]
Staging: comedi: remove unnecessary braces in pcl711.c

This patch for pcl711.c removes braces causing a checkpatch.pl warning.
It also removes an empty else arm of an if-else statement.

Signed-off-by: Chase Southwood <chase.southwood@yahoo.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoion: Fix sparse non static symbol warnings
Wei Yongjun [Tue, 14 Jan 2014 02:04:49 +0000 (10:04 +0800)]
ion: Fix sparse non static symbol warnings

Fixes the following sparse warnings:

drivers/staging/android/ion/ion_dummy_driver.c:26:19: warning: symbol 'idev' was not declared. Should it be static?
drivers/staging/android/ion/ion_dummy_driver.c:27:17: warning: symbol 'heaps' was not declared. Should it be static?
drivers/staging/android/ion/ion_dummy_driver.c:29:6: warning: symbol 'carveout_ptr' was not declared. Should it be static?
drivers/staging/android/ion/ion_dummy_driver.c:30:6: warning: symbol 'chunk_ptr' was not declared. Should it be static?
drivers/staging/android/ion/ion_dummy_driver.c:32:26: warning: symbol 'dummy_heaps' was not declared. Should it be static?
drivers/staging/android/ion/ion_dummy_driver.c:59:26: warning: symbol 'dummy_ion_pdata' was not declared. Should it be static?

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: Fix dev_<level> messages
Joe Perches [Tue, 14 Jan 2014 05:09:39 +0000 (21:09 -0800)]
staging: ced1401: Fix dev_<level> messages

Add a missing newline to each message.
Standardize style to "%s: ...", __func__.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: lustre: fix quotactl permission denied (LU-4530)
Cédric Dufour - Idiap Research Institute [Fri, 24 Jan 2014 19:57:05 +0000 (20:57 +0100)]
staging: lustre: fix quotactl permission denied (LU-4530)

The changes introduced in commit 4b1a25f06b30b203 ("fix build when
CONFIG_UIDGID_STRICT_TYPE_CHECKS is on") got the UID check the wrong way
around, leading to "Permission denied" when a regular user attempts to
retrieve his quota (lfs quota -u ...) but allowing him to retrieve other
users quota.

Full details at: https://jira.hpdd.intel.com/browse/LU-4530

Cc: Peng Tao <tao.peng@emc.com>
Cc: <stable@vger.kernel.org> # 3.12.x
Cc: <stable@vger.kernel.org> # 3.13.x
Signed-off-by: Cédric Dufour <cedric.dufour@idiap.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: lustre: Fix typo in lustre/ptlrpc
Masanari Iida [Fri, 7 Feb 2014 15:30:40 +0000 (00:30 +0900)]
staging: lustre: Fix typo in lustre/ptlrpc

This patch fixed spelling typo in lustre/ptlrpc.

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: lustre: Fix typo in lustre/ptlrpc/gss
Masanari Iida [Fri, 7 Feb 2014 15:30:39 +0000 (00:30 +0900)]
staging: lustre: Fix typo in lustre/ptlrpc/gss

This patch fixed spelling typo in comments within
lustre/ptlrpc/gss.

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: lustre: Fix typo in sec_gss.c
Masanari Iida [Fri, 7 Feb 2014 15:30:38 +0000 (00:30 +0900)]
staging: lustre: Fix typo in sec_gss.c

This patch fixed spelling typo in comments wihtin sec_gss.c

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: lustre: Fix typo in sec.c
Masanari Iida [Fri, 7 Feb 2014 15:30:37 +0000 (00:30 +0900)]
staging: lustre: Fix typo in sec.c

This patch fixed spelling typos in sec.c

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: lustre: Fix typo in service.c
Masanari Iida [Fri, 7 Feb 2014 15:30:36 +0000 (00:30 +0900)]
staging: lustre: Fix typo in service.c

This patch fixed spelling typo founx in service.c

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: lustre: Fix typo in client.c
Masanari Iida [Fri, 7 Feb 2014 15:30:35 +0000 (00:30 +0900)]
staging: lustre: Fix typo in client.c

This patch fixed spelling typo found in client.c

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: lustre: remove unnecessary 'magic' from lustre_pack_request
Dave Jones [Thu, 30 Jan 2014 17:48:51 +0000 (12:48 -0500)]
staging: lustre: remove unnecessary 'magic' from lustre_pack_request

This probably made more sense when the code supported multiple protocol versions,
but now it's just obfuscation.

Signed-off-by: Dave Jones <davej@fedoraproject.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging/lustre/libcfs: remove cfs_capable
Peng Tao [Wed, 22 Jan 2014 13:47:37 +0000 (21:47 +0800)]
staging/lustre/libcfs: remove cfs_capable

Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging/lustre/libcfs: remove CAPABILITY_VERSION tests
Peng Tao [Wed, 22 Jan 2014 13:47:36 +0000 (21:47 +0800)]
staging/lustre/libcfs: remove CAPABILITY_VERSION tests

_LINUX_CAPABILITY_VERSION is only for backward compatibility in
user space. Kernel code doesn't care about it.

Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging/lustre/libcfs: remove cfs_cap_{un}pack
Peng Tao [Wed, 22 Jan 2014 13:47:35 +0000 (21:47 +0800)]
staging/lustre/libcfs: remove cfs_cap_{un}pack

Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging/lustre/libcfs: remove cfs_curproc_cap_unpack
Peng Tao [Wed, 22 Jan 2014 13:47:34 +0000 (21:47 +0800)]
staging/lustre/libcfs: remove cfs_curproc_cap_unpack

no user.

Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging/lustre/libcfs: remove cfs_curproc_groups_nr
Peng Tao [Wed, 22 Jan 2014 13:47:33 +0000 (21:47 +0800)]
staging/lustre/libcfs: remove cfs_curproc_groups_nr

no user.

Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging/lustre/o2iblnd: fix is_vmalloc_addr build warning
Peng Tao [Wed, 22 Jan 2014 13:47:32 +0000 (21:47 +0800)]
staging/lustre/o2iblnd: fix is_vmalloc_addr build warning

I got this building Lustre:
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c: In function ‘kiblnd_kvaddr_to_page’:
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c:532:2: warning: passing argument 1 of ‘is_vmalloc_addr’ makes pointer from integer without a cast [enabled by default]

Cc: Laura Abbott <lauraa@codeaurora.org>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging/lustre/ptlrpc: flock deadlock detection does not work
Andriy Skulysh [Wed, 22 Jan 2014 13:36:19 +0000 (21:36 +0800)]
staging/lustre/ptlrpc: flock deadlock detection does not work

Flock deadlocks are checked on the first attempt to grant
the flock only. If we try again to grant it after its
blocking lock is cancelled, we don't check for deadlocks
which also may exist.

Perform deadlock detection during reprocess

Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-1715
Lustre-change: http://review.whamcloud.com/3553
Signed-off-by: Andriy Skulysh <Andriy_Skulysh@xyratex.com>
Reviewed-by: Vitaly Fertman <vitaly_fertman@xyratex.com>
Reviewed-by: Bruce Korb <bruce_korb@xyratex.com>
Reviewed-by: Keith Mannthey <keith.mannthey@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging/lustre/lustre_user.h: remove obsolete comments
JC Lafoucriere [Wed, 22 Jan 2014 13:36:18 +0000 (21:36 +0800)]
staging/lustre/lustre_user.h: remove obsolete comments

This is only part of the original Lustre commit, main part of which changes
user space code. And now the comments above struct hsm_copy is no more true.

Lustre-change: http://review.whamcloud.com/4737
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-2062
Signed-off-by: JC Lafoucriere <jacques-charles.lafoucriere@cea.fr>
Signed-off-by: Henri Doreau <henri.doreau@cea.fr>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging/lustre/mgs: set_param -P option that sets value permanently
Artem Blagodarenko [Wed, 22 Jan 2014 13:36:16 +0000 (21:36 +0800)]
staging/lustre/mgs: set_param -P option that sets value permanently

set_param and conf_param have different syntaxes. Also conf_param
has unimplemented paths and no wildcarding support.

This patch adds set_param -P option, that replaces the whole
conf_param "direct" proc access with a simple upcall-type mechanism
from the MGC. Option conf_param is saved now for compatibility.

Part of the original Lustre commit changes server code.
The patch only picks up client side change.

Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3155
Lustre-change: http://review.whamcloud.com/6025
Signed-off-by: Artem Blagodarenko <artem_blagodarenko@xyratex.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Emoly Liu <emoly.liu@intel.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging/lustre/idl: remove LASSERT/CLASSERT from lustre_idl.h
Andreas Dilger [Wed, 22 Jan 2014 13:36:15 +0000 (21:36 +0800)]
staging/lustre/idl: remove LASSERT/CLASSERT from lustre_idl.h

Remove the usage of LASSERT() and CLASSERT() from lustre_idl.h, so
that it is usable from userspace programs if needed.  These have
crept in over the years, but are not intended to be there.

The CLASSERT() checks for fid swabbing were largely redundant, and
have been moved to lustre/fid/fid_handler.c.

There are still a few LASSERTs that need to be removed when FID-on-OST
is landed, but I don't want to remove them before that code lands.

There are also uses of CERROR() that could be removed at that time.

Lustre-change: http://review.whamcloud.com/5682
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-1606
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Signed-off-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Christopher J. Morrone <chris.morrone.llnl@gmail.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging/lustre/llite: pass correct pointer to obd_iocontrol()
John L. Hammond [Wed, 22 Jan 2014 13:36:14 +0000 (21:36 +0800)]
staging/lustre/llite: pass correct pointer to obd_iocontrol()

In copy_and_ioctl() use the kernel space copy as the karg to
obd_iocontrol().

Lustre-change: http://review.whamcloud.com/6274
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3283
Signed-off-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Sebastien Buisson <sebastien.buisson@bull.net>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging/lustre/llite: don't d_add for create only files
Lai Siyao [Wed, 22 Jan 2014 13:36:13 +0000 (21:36 +0800)]
staging/lustre/llite: don't d_add for create only files

This is only part of the original Lustre commit. Splitted to remove
d_add() for create only files, because the dentry is fake,
and will be released right after use.

Lustre-change: http://review.whamcloud.com/6797
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3486
Signed-off-by: Lai Siyao <lai.siyao@intel.com>
Reviewed-by: James Simmons <uja.ornl@gmail.com>
Reviewed-by: Peng Tao <bergwolf@gmail.com>
Reviewed-by: Bobi Jam <bobijam@gmail.com>
Reviewed-by: Fan Yong <fan.yong@intel.com>
Reviewed-by: Alexey Shvetsov <alexxy@gentoo.org>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging/lustre/llite: remove ll_d_root_ops
Lai Siyao [Wed, 22 Jan 2014 13:36:12 +0000 (21:36 +0800)]
staging/lustre/llite: remove ll_d_root_ops

Mnt root dentry will never be revalidated, but its d_op->d_compare
will be called for its children, to simplify code, we use the same
ll_d_ops as normal dentries.
But its attribute may be invalid before access, this won't cause
any issue because it always exists, and the only operation depends
on its attribute is .permission, which has revalidated it in lustre
code.

So it's okay to remove ll_d_root_ops, and remove unnecessary checks
in lookup/revalidate/statahead.

Lustre-change: http://review.whamcloud.com/6797
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3486
Signed-off-by: Lai Siyao <lai.siyao@intel.com>
Reviewed-by: James Simmons <uja.ornl@gmail.com>
Reviewed-by: Peng Tao <bergwolf@gmail.com>
Reviewed-by: Bobi Jam <bobijam@gmail.com>
Reviewed-by: Fan Yong <fan.yong@intel.com>
Reviewed-by: Alexey Shvetsov <alexxy@gentoo.org>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>