GitHub/moto-9609/android_kernel_motorola_exynos9610.git
11 years agostaging/lustre/obdclass: remove obsoleted md_local_file.c
Mikhail Pershin [Mon, 3 Jun 2013 13:40:46 +0000 (21:40 +0800)]
staging/lustre/obdclass: remove obsoleted md_local_file.c

This library is not used anymore and is replaced by
local_storage.c. Patch removed last remnants of it.

Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-2886
Lustre-change: http://review.whamcloud.com/6107
Signed-off-by: Mikhail Pershin <mike.pershin@intel.com>
Reviewed-by: Fan Yong <fan.yong@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Alex Zhuravlev <alexey.zhuravlev@intel.com>
Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging/lustre/osc: some cleanup to reduce stack overflow chance
Bobi Jam [Mon, 3 Jun 2013 13:40:45 +0000 (21:40 +0800)]
staging/lustre/osc: some cleanup to reduce stack overflow chance

ptlrpcd_add_req() will wake_up other process, do not hold a spinlock
before calling ptlrpcd_queue_work()->ptlrpcd_add_req().

If current process is allocating memory, memory shrinker could get to
osc_lru_del(), don't call osc_lru_shrink() further since it could
lead a long calling chain.

Use static string OES_STRINGS in OSC_EXTENT_DUMP() to reduce stack
footprint.

Alloc crattr on heap for osc_build_rpc() to reduce stack footprint.

Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3281
Lustre-change: http://review.whamcloud.com/6270
Signed-off-by: Bobi Jam <bobijam.xu@intel.com>
Reviewed-by: Jinshan Xiong <jinshan.xiong@intel.com>
Reviewed-by: Keith Mannthey <keith.mannthey@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging/lustre/ldlm: suppress useless lock RPC for layout
JC Lafoucriere [Mon, 3 Jun 2013 13:40:44 +0000 (21:40 +0800)]
staging/lustre/ldlm: suppress useless lock RPC for layout

In ldlm_lock_decref_internal() when l_lvb_data is freed to
reduce memory consumption, LDLM_FL_LVB_READY is not
cleared, so later when the lock is reused lvb is not
updated. But clearing LDLM_FL_LVB_READY forces layout refetch
at each file access, so the better is to remove the optimization.
The use case is after a restore in HSM.

Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3280
Lustre-change: http://review.whamcloud.com/6268
Signed-off-by: JC Lafoucriere <jacques-charles.lafoucriere@cea.fr>
Reviewed-by: Fan Yong <fan.yong@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging/lustre: Revert "LU-2139 osc: Track and limit "unstable" pages"
Oleg Drokin [Mon, 3 Jun 2013 13:40:43 +0000 (21:40 +0800)]
staging/lustre: Revert "LU-2139 osc: Track and limit "unstable" pages"

This seems to be causing multiple issues: LU-3274, LU-3277

[The original commit is folded in the large Lusre patch. So we don't
have an exact commit to revert for kernel client -- Peng Tao]
Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging/lustre/debug: quiet noisy console error messages
Andreas Dilger [Mon, 3 Jun 2013 13:40:42 +0000 (21:40 +0800)]
staging/lustre/debug: quiet noisy console error messages

Quiet a number of overly noisy and unhelpful console error
messages.  Improve the format of other nearby errors.

In the case of {lod,lov}_fix_desc_stripe_size(), this doesn't
even need a console message unless it is actually changing
some stripe size that is below the minimum.  Typically it is
only zero and is being bumped up to the default value.

[picked lov part for upstream kernel submission]
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-1095
Lustre-change: http://review.whamcloud.com/6264
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Bobi Jam <bobijam@gmail.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging/lustre/utils: missing setting echo seq for getattr/setattr
wang di [Mon, 3 Jun 2013 13:40:41 +0000 (21:40 +0800)]
staging/lustre/utils: missing setting echo seq for getattr/setattr

It should set echo seq before do echo getattr/setattr, otherwise
echo_client will regard it as the object with MDT0 sequence.

[picked echo client part for upstream kernel submission]
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3267
Lustre-change: http://review.whamcloud.com/6263
Signed-off-by: wang di <di.wang@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Lai Siyao <lai.siyao@intel.com>
Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging/lustre/fids: fix compilation error with gcc 4.7.2
Alex Zhuravlev [Mon, 3 Jun 2013 13:40:40 +0000 (21:40 +0800)]
staging/lustre/fids: fix compilation error with gcc 4.7.2

initialize oi.oi.oi_id which gcc 4.7.2 is afraid of being
used later.

Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3179
Lustre-change: http://review.whamcloud.com/6064
Signed-off-by: Alex Zhuravlev <alexey.zhuravlev@intel.com>
Reviewed-by: wangdi <di.wang@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: James Simmons <uja.ornl@gmail.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging/lustre/ofd: refill env in ofd_get_info
wang di [Mon, 3 Jun 2013 13:40:39 +0000 (21:40 +0800)]
staging/lustre/ofd: refill env in ofd_get_info

Because ofd_get_info(KEY_FIEMAP) might be called from
ptlrpc_server_handle_req_in(see the stack below),
where env might not be initialized correctly(see LBUG below),
so it refill refill in ofd_get_info.

LutreError: 19182:0:(ofd_internal.h:518:ofd_info_init()) LBUG
Pid: 19182, comm: ll_ost_io00_001
Call Trace:
[<ffffffffa044e895>] libcfs_debug_dumpstack+0x55/0x80 [libcfs]
[<ffffffffa044ee97>] lbug_with_loc+0x47/0xb0 [libcfs]
[<ffffffffa0e03e62>] ofd_info_init+0x92/0x130 [ofd]
[<ffffffffa0e05835>] ofd_get_info+0x2e5/0xa90 [ofd]
[<ffffffff812805cd>] ? pointer+0x8d/0x830
[<ffffffffa029f7e5>] ? lprocfs_counter_add+0x125/0x182 [lvfs]
[<ffffffffa078528a>] nrs_orr_range_fill_physical+0x18a/0x540
[ptlrpc]
[<ffffffffa0762dd6>] ? __req_capsule_get+0x166/0x700 [ptlrpc]
[<ffffffffa073e630>] ? lustre_swab_ost_body+0x0/0x10 [ptlrpc]
[<ffffffffa07871d7>] nrs_orr_res_get+0x817/0xb80 [ptlrpc]
[<ffffffffa077d306>] nrs_resource_get+0x56/0x110 [ptlrpc]
[<ffffffffa077dccb>] nrs_resource_get_safe+0x8b/0x100 [ptlrpc]
[<ffffffffa0780248>] ptlrpc_nrs_req_initialize+0x38/0x90 [ptlrpc]
[<ffffffffa074cff0>] ptlrpc_main+0x1170/0x16f0 [ptlrpc]
[<ffffffffa074be80>] ? ptlrpc_main+0x0/0x16f0 [ptlrpc]
[<ffffffff8100c0ca>] child_rip+0xa/0x20
[<ffffffffa074be80>] ? ptlrpc_main+0x0/0x16f0 [ptlrpc]
[<ffffffffa074be80>] ? ptlrpc_main+0x0/0x16f0 [ptlrpc]
[<ffffffff8100c0c0>] ? child_rip+0x0/0x20

[picked ptlrpc part for upstream kernel submission]
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3239
Lustre-change: http://review.whamcloud.com/6204
Signed-off-by: wang di <di.wang@intel.com>
Reviewed-by: Alex Zhuravlev <alexey.zhuravlev@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Nikitas Angelinas <nikitas_angelinas@xyratex.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging/lustre/clio: don't ignore layout on writeback
Niu Yawei [Mon, 3 Jun 2013 13:40:38 +0000 (21:40 +0800)]
staging/lustre/clio: don't ignore layout on writeback

In some cases such as kernel writeback, we shouldn't ignore the
layout, otherwise, it could race with layout change undergoing.

Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3160
Lustre-change: http://review.whamcloud.com/6154
Signed-off-by: Niu Yawei <yawei.niu@intel.com>
Signed-off-by: Jinshan Xiong <jinshan.xiong@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Fan Yong <fan.yong@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging/lustre: drop CONFIG_BROKEN dependency
Peng Tao [Mon, 3 Jun 2013 13:37:29 +0000 (21:37 +0800)]
staging/lustre: drop CONFIG_BROKEN dependency

Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging/lustre: remove enum config_flags and obd_mount_server.c
Peng Tao [Mon, 3 Jun 2013 13:37:28 +0000 (21:37 +0800)]
staging/lustre: remove enum config_flags and obd_mount_server.c

obd_mount_server.c is not really used at all, and we can remove
enum config_flags that are causing symbol conflictions due to
CONFIG_ prefixing...

Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: csr: fix indentation style issue in bh.c
Davis Abubakr-Sadik Nii Nai [Tue, 28 May 2013 17:52:06 +0000 (17:52 +0000)]
Staging: csr: fix indentation style issue in bh.c

This is a patch to the bh.c file that fixes up all indentation errors
found the checkpatch.pl tool. Two lines beyond 80 characters are left
alone to improve readability

Signed-off-by: Davis Abubakr-Sadik Nii Nai <dwa2pac@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: vt6656: rf.c: Remove camel case from local variables
Malcolm Priestley [Mon, 27 May 2013 13:09:52 +0000 (14:09 +0100)]
staging: vt6656: rf.c: Remove camel case from local variables

Camel case changes;
Static declaration
abyAL2230InitTable -> al2230_init_table
abyAL2230ChannelTable0 -> al2230_channel_table0
abyAL2230ChannelTable1 -> al2230_channel_table1

abyAL7230InitTable -> al7230_init_table_amode
abyAL7230ChannelTable0 -> al7230_channel_table0
abyAL7230ChannelTable1 -> al7230_channel_table1
abyAL7230ChannelTable2 -> al7230_channel_table2

abyVT3226_InitTable -> at3226_init_table
abyVT3226D0_InitTable -> at3226d0_init_table
abyVT3226_ChannelTable0 -> vt3226_channel_table0
abyVT3226_ChannelTable1 -> vt3226_channel_table1

abyVT3342A0_InitTable -> vt3342a0_init_table
abyVT3342_ChannelTable0 -> vt3342_channel_table0
abyVT3342_ChannelTable1 -> vt3342_channel_table1

Constant declaration
dwVT3226D0LoCurrentTable -> vt3226d0_lo_current_table

dwAL2230PowerTable -> al2230_power_table

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: vt6656: rf.c: RFbRFTableDownload: Remove camel case and clean up.
Malcolm Priestley [Mon, 27 May 2013 13:07:27 +0000 (14:07 +0100)]
staging: vt6656: rf.c: RFbRFTableDownload: Remove camel case and clean up.

White space clean up.

Camel case changes;
pDevice -> priv
wLength1 -> length1
wLength2 -> length2
wLength3 -> length3
pbyAddr1 -> addr1
pbyAddr2 -> addr2
pbyAddr3 -> addr3
wLength -> length
wValue -> value
abyArray -> array

No functional changes.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: vt6656: rf.c: RFvRSSITodBm Remove camel case and clean up.
Malcolm Priestley [Mon, 27 May 2013 13:05:51 +0000 (14:05 +0100)]
staging: vt6656: rf.c: RFvRSSITodBm Remove camel case and clean up.

White space clean up.

Camel case changes;
pDevice -> priv
byCurrRSSI -> rssi
pldBm -> dbm
byIdx -> idx
abyAIROHARF -> airoharf

No functional changes.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: vt6656: rf.c: RFbRawSetPower Remove camel case and cleanup.
Malcolm Priestley [Mon, 27 May 2013 13:03:42 +0000 (14:03 +0100)]
staging: vt6656: rf.c: RFbRawSetPower Remove camel case and cleanup.

White space clean up.

Camel case changes;
pDevice -> priv
uRATE -> rate
bResult -> ret
byPwr -> power

Functional change merged as one variable.
dwMax7230Pwr -> power_setting
dwVT3226Pwr -> power_setting
dwVT3342Pwr -> power_setting

Author changes moved to Revision history.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: vt6656: rf.c: RFbSetPower Remove camel case and clean up.
Malcolm Priestley [Mon, 27 May 2013 13:02:09 +0000 (14:02 +0100)]
staging: vt6656: rf.c: RFbSetPower Remove camel case and clean up.

White space clean up.

Camel case changes;
pDevice -> priv
uRATE -> rate
uCH -> channel
bResult -> ret
byPwr -> power

No functional changes.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agortl8192u: fix printk calls in r8192U_core.c
Xenia Ragiadakou [Sun, 26 May 2013 19:42:44 +0000 (22:42 +0300)]
rtl8192u: fix printk calls in r8192U_core.c

This patch replaces calls to printk with their
corresponding calls to pr_<loglevel>(fmt, ...)
and netdev_<loglevel>(dev, fmt, ...), when it
is applicable, to make the log messages more
informative.

Also, it fixes some small typos and whitespaces
found in log messages.

Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoozwpan: replace kfree_skb with dev_kfree_skb in ozproto.c
Xenia Ragiadakou [Thu, 23 May 2013 17:51:59 +0000 (20:51 +0300)]
ozwpan: replace kfree_skb with dev_kfree_skb in ozproto.c

This patch replaces the calls to kfree_skb with
calls to dev_kfree_skb.

Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoozwpan: replace kfree_skb with dev_kfree_skb in ozpd.c
Xenia Ragiadakou [Thu, 23 May 2013 17:51:58 +0000 (20:51 +0300)]
ozwpan: replace kfree_skb with dev_kfree_skb in ozpd.c

This patch replaces the calls to kfree_skb with
calls to dev_kfree_skb.

Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoozwpan: replace alloc_skb with dev_alloc_skb in ozproto.c
Xenia Ragiadakou [Thu, 23 May 2013 17:51:57 +0000 (20:51 +0300)]
ozwpan: replace alloc_skb with dev_alloc_skb in ozproto.c

This patch replaces the calls to alloc_skb with calls
to dev_alloc_skb.

dev_alloc_skb has GFP_ATOMIC priority so the
replacement does not change the code semantics.

Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoozwpan: replace alloc_skb with dev_alloc_skb in ozpd.c
Xenia Ragiadakou [Thu, 23 May 2013 17:51:56 +0000 (20:51 +0300)]
ozwpan: replace alloc_skb with dev_alloc_skb in ozpd.c

This patch replaces the calls to alloc_skb with calls
to dev_alloc_skb.

dev_alloc_skb has GFP_ATOMIC priority so the
replacement does not change the code semantics.

Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging/silicom/bypasslib: Move opening brace to previous line
Lisa Nguyen [Thu, 23 May 2013 20:54:47 +0000 (13:54 -0700)]
staging/silicom/bypasslib: Move opening brace to previous line

Moved opening brace to previous line to resolve checkpatch errors and
meet kernel coding standards in bplibk.h

Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging/silicom/bypasslib: Remove extra space before line
Lisa Nguyen [Thu, 23 May 2013 20:54:05 +0000 (13:54 -0700)]
staging/silicom/bypasslib: Remove extra space before line

Removed extra space at beginning of a statement to resolve
checkpatch errors and meet kernel coding standards in bplibk.h

Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging/silicom/bypasslib: Add space around ||
Lisa Nguyen [Thu, 23 May 2013 20:53:43 +0000 (13:53 -0700)]
staging/silicom/bypasslib: Add space around ||

Added space around piping symbols to resolve checkpatch errors and
meet kernel coding standards in bplibk.h

Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging/silicom/bypasslib: Add space around &&
Lisa Nguyen [Thu, 23 May 2013 20:53:12 +0000 (13:53 -0700)]
staging/silicom/bypasslib: Add space around &&

Added space around double ampersands to resolve checkpatch errors
and meet kernel coding standards in bplibk.h

Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging/silicom/bypasslib: Add space around ==
Lisa Nguyen [Thu, 23 May 2013 20:52:41 +0000 (13:52 -0700)]
staging/silicom/bypasslib: Add space around ==

Added space around equal signs to resolve checkpatch errors and
meet kernel coding standards in bplibk.h

Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging/silicom/bypasslib: Fix code indentation errors
Lisa Nguyen [Thu, 23 May 2013 20:52:17 +0000 (13:52 -0700)]
staging/silicom/bypasslib: Fix code indentation errors

Fixed code indentation errors generated by checkpatch.pl to
meet kernel coding standards in bplibk.h

Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging/silicom/bypasslib: Reformat comments
Lisa Nguyen [Thu, 23 May 2013 20:51:43 +0000 (13:51 -0700)]
staging/silicom/bypasslib: Reformat comments

Resolved the C99 comment style issue by reformatting existing comments
to meet kernel coding standards in bp_ioctl.h

Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: drm/imx: revert vsync_cnt for di->id 1
Markus Niebel [Mon, 27 May 2013 08:19:11 +0000 (10:19 +0200)]
staging: drm/imx: revert vsync_cnt for di->id 1

partial fix of changes from
"staging: drm/imx: Add support for VGA via TVE on i.MX53"

parallel display support / DVI needs the original setting to work

Signed-off-by: Markus Niebel <Markus.Niebel@tqs.de>
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
Tested-by: Philipp Zabel <p.zabel@pengutronix.de>
Tested-by: Rogerio Pimentel <rpimentel.silva@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: drm/imx: fix spelling error for vsync flag config
Markus Niebel [Mon, 27 May 2013 08:19:10 +0000 (10:19 +0200)]
staging: drm/imx: fix spelling error for vsync flag config

partial fix of changes from
"staging: drm/imx: Add support for VGA via TVE on i.MX53"

Have to check for vsync_pin instead of hsync_pin to set Vsync_pol.

Signed-off-by: Markus Niebel <Markus.Niebel@tqs.de>
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
Tested-by: Philipp Zabel <p.zabel@pengutronix.de>
Tested-by: Rogerio Pimentel <rpimentel.silva@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: drm/imx: set correct sync pins for display
Markus Niebel [Mon, 27 May 2013 08:19:09 +0000 (10:19 +0200)]
staging: drm/imx: set correct sync pins for display

partial fix of changes from
"staging: drm/imx: Add support for VGA via TVE on i.MX53"

Have to call imx_drm_crtc_panel_format_pins in imx_drm_crtc_panel_format
with the correct pins instead of (0, 0) This enables configuration of
correct waveforms for vsync / hsync for parallel display, LDB (i.MX53 and
i.MX6) as well as HDMI and MIPI (i.MX6)

TODO: configure pins via device tree

Signed-off-by: Markus Niebel <Markus.Niebel@tqs.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: btmtk_usb: check for a valid io_buf pointer
Devendra Naga [Sun, 26 May 2013 03:04:16 +0000 (23:04 -0400)]
staging: btmtk_usb: check for a valid io_buf pointer

assigned to retval of kmalloc but not checked whether the allocation failed or not,
fail the registering if allocation fail

Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: dwc2: change some dev_dbg() messages to dev_vdbg()
Paul Zimmerman [Fri, 24 May 2013 23:32:12 +0000 (16:32 -0700)]
staging: dwc2: change some dev_dbg() messages to dev_vdbg()

Change some dev_dbg() messages in dwc2_hcd_hub_control() to
dev_vdbg(), to prevent massive spew to the dmesg log when a device
is disconnected.

Signed-off-by: Paul Zimmerman <paulz@synopsys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: winbond: Made local functions static
Harsh Kumar [Thu, 30 May 2013 05:48:12 +0000 (11:18 +0530)]
Staging: winbond: Made local functions static

Few functions are used only in one file. They are not included in any
other .h or .c files (I used grep to check). They seem to be local functions.
So, I have made them static.
I have also inlined one function as it is a one line function.

Signed-off-by: Harsh Kumar <harsh1kumar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: winbond: usb_free_urb(NULL) is safe
Harsh Kumar [Thu, 30 May 2013 04:35:02 +0000 (10:05 +0530)]
Staging: winbond: usb_free_urb(NULL) is safe

usb_free_urb(NULL) is safe. So, the check was removed. Also, couple of checkpatch.pl fixes

Signed-off-by: Harsh Kumar <harsh1kumar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: fwserial: Use normal logging styles
Joe Perches [Wed, 29 May 2013 02:44:24 +0000 (19:44 -0700)]
staging: fwserial: Use normal logging styles

Logging messages without newline termination are subject
to interleaving by other messages.

Avoid this by adding newlines to each message.

Neaten fwtty_<level> logging macros.
Convert driver_err to pr_err.
Add #define pr_fmt to prefix those messages.
Remove now unused driver_err macro.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: xgifb: vb_setmode: delete IF_DEF_CRT2Monitor checks
Aaro Koskinen [Wed, 29 May 2013 20:59:16 +0000 (23:59 +0300)]
staging: xgifb: vb_setmode: delete IF_DEF_CRT2Monitor checks

Code checking for IF_DEF_CRT2Monitor is only executed for chips < XG20,
and there IF_DEF_CRT2Monitor is always true, so the flag is redundant.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: xgifb: vb_setmode: delete IF_DEF_HiVision checks
Aaro Koskinen [Wed, 29 May 2013 20:59:15 +0000 (23:59 +0300)]
staging: xgifb: vb_setmode: delete IF_DEF_HiVision checks

Code checking for IF_DEF_HiVision is only executed for chips < XG20,
and there IF_DEF_HiVision is always true, so the flag is redundant.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: xgifb: vb_setmode: delete IF_DEF_YPbPr checks
Aaro Koskinen [Wed, 29 May 2013 20:59:14 +0000 (23:59 +0300)]
staging: xgifb: vb_setmode: delete IF_DEF_YPbPr checks

Code checking for IF_DEF_YPbPr is only executed for chips < XG20, and
there IF_DEF_YPbPr is always true, so the flag is redundant.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: xgifb: delete redundant return statements
Aaro Koskinen [Wed, 29 May 2013 20:59:13 +0000 (23:59 +0300)]
staging: xgifb: delete redundant return statements

Delete redundant return statements at the end of void functions.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: xgifb: XGI_DisableBridge(): delete redundant checks
Aaro Koskinen [Wed, 29 May 2013 20:59:12 +0000 (23:59 +0300)]
staging: xgifb: XGI_DisableBridge(): delete redundant checks

Delete some redudant checks.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: xgifb: XGI_EnableChISLCD(): delete trivial function
Aaro Koskinen [Wed, 29 May 2013 20:59:11 +0000 (23:59 +0300)]
staging: xgifb: XGI_EnableChISLCD(): delete trivial function

The function returns always false, delete it.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: xgifb: SetFlag: delete EnableChA
Aaro Koskinen [Wed, 29 May 2013 20:59:10 +0000 (23:59 +0300)]
staging: xgifb: SetFlag: delete EnableChA

This flag is never set, so checks can be removed and code behind it
deleted.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: xgifb: SetFlag: delete DisableChA
Aaro Koskinen [Wed, 29 May 2013 20:59:09 +0000 (23:59 +0300)]
staging: xgifb: SetFlag: delete DisableChA

This flag is never set, so checks can be removed and code behind it
deleted.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: xgifb: SetFlag: delete EnableChB
Aaro Koskinen [Wed, 29 May 2013 20:59:08 +0000 (23:59 +0300)]
staging: xgifb: SetFlag: delete EnableChB

This flag is never set, so checks can be removed and code behind it
deleted.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: xgifb: SetFlag: delete DisableChB
Aaro Koskinen [Wed, 29 May 2013 20:59:07 +0000 (23:59 +0300)]
staging: xgifb: SetFlag: delete DisableChB

This flag is never set, so checks can be removed and code behind it
deleted.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: xgifb: SetFlag: delete GatingCRT
Aaro Koskinen [Wed, 29 May 2013 20:59:06 +0000 (23:59 +0300)]
staging: xgifb: SetFlag: delete GatingCRT

This flag is never set, so checks can be removed and code behind it
deleted.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: xgifb: XGI_SetCRT1VCLK(): avoid copy-paste
Aaro Koskinen [Wed, 29 May 2013 20:59:05 +0000 (23:59 +0300)]
staging: xgifb: XGI_SetCRT1VCLK(): avoid copy-paste

Avoid copy-pasted code in if branches by rearranging the checks.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: xgifb: XGI_GetRatePtrCRT2(): delete IF_DEF_LVDS check
Aaro Koskinen [Wed, 29 May 2013 20:59:04 +0000 (23:59 +0300)]
staging: xgifb: XGI_GetRatePtrCRT2(): delete IF_DEF_LVDS check

IF_DEF_LVDS cannot be set if ProgrammingCRT2 flag is set, so remove the
check to simplify the code.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: xgifb: XGI_AjustCRT2Rate(): delete IF_DEF_LVDS check
Aaro Koskinen [Wed, 29 May 2013 20:59:03 +0000 (23:59 +0300)]
staging: xgifb: XGI_AjustCRT2Rate(): delete IF_DEF_LVDS check

IF_DEF_LVDS cannot be set when XGI_AjustCRT2Rate() is called, so we can
remove the check and dead code.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: xgifb: call XGI_GetVBType from InitTo330Pointer
Aaro Koskinen [Wed, 29 May 2013 20:59:02 +0000 (23:59 +0300)]
staging: xgifb: call XGI_GetVBType from InitTo330Pointer

Move XGI_GetVBType call inside InitTo330Pointer to avoid code duplication.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: xgifb: XGI_GetVBType(): delete IF_DEF_LVDS check
Aaro Koskinen [Wed, 29 May 2013 20:59:01 +0000 (23:59 +0300)]
staging: xgifb: XGI_GetVBType(): delete IF_DEF_LVDS check

XGI_GetVBType() is called only for chips < XG20 so IF_DEF_LVDS cannot
be set.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: xgifb: refactor XGI_BridgeIsOn()
Aaro Koskinen [Wed, 29 May 2013 20:59:00 +0000 (23:59 +0300)]
staging: xgifb: refactor XGI_BridgeIsOn()

Refactor XGI_BridgeIsOn(). IF_DEF_LVDS bit is not valid for < XG20 chips.
Also we can make the function static by moving it to vb_init.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging/lustre: fix LBUG and inode refcount bug
Peng Tao [Wed, 29 May 2013 13:40:56 +0000 (21:40 +0800)]
staging/lustre: fix LBUG and inode refcount bug

ldlm_proc_setup and ldlm_proc_cleanup should reset global
pde pointers otherwise remount may hit
LASSERT(ldlm_ns_proc_dir == NULL);

Also in libcfs_sock_ioctl, fput() includes itself sock_release.
So don't call sock_release twice otherwise kernel may oops
due to incorrect inode ref counting.

Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging/lustre: adapt proc_dir_entry change
Peng Tao [Wed, 29 May 2013 13:40:55 +0000 (21:40 +0800)]
staging/lustre: adapt proc_dir_entry change

In 3.10 merge window, proc_dir_entry is now private to proc. However,
Lustre lprocfs depends heavily on it and its now-gone read_proc_t and
write_proc_t members.

The patch largely changed the fact, and made lprocfs depend on none of
proc_dir_entry private members. All lprocfs callers are converted to
use the new seq_file scheme.

Also lprocfs_srch is removed so that we can drop lprocfs_lock. All callers
are changed to save created pde in proper place.

See https://jira.hpdd.intel.com/browse/LU-3319 for more details.

Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging/lustre: fix build error
Peng Tao [Wed, 29 May 2013 13:40:54 +0000 (21:40 +0800)]
staging/lustre: fix build error

We missed one file...

Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: rtl8192e: fix an endian bug
Dan Carpenter [Wed, 29 May 2013 08:12:18 +0000 (11:12 +0300)]
Staging: rtl8192e: fix an endian bug

Passing the high bits of "ratr_value" to rtl8192_config_rate() only
works on little endian systems.  We should be passing a u16 value.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: rtl8192e: printing the wrong array
Dan Carpenter [Wed, 29 May 2013 06:57:36 +0000 (09:57 +0300)]
Staging: rtl8192e: printing the wrong array

Smatch complained that there is an array overflow here.  It looks
like we are supposed to be printing the ->rates_ex[] array which is
slightly larger than the ->rates[] array.  This is a cut and paste
error.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: rtl8192e: delete some dead cruft
Dan Carpenter [Wed, 29 May 2013 06:56:00 +0000 (09:56 +0300)]
Staging: rtl8192e: delete some dead cruft

I have removed some unneeded comments, some blank lines and some
unused macros.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: vt6655: add missing free_netdev() on error in hostap_enable_hostapd()
Wei Yongjun [Thu, 23 May 2013 09:28:05 +0000 (17:28 +0800)]
Staging: vt6655: add missing free_netdev() on error in hostap_enable_hostapd()

Add the missing free_netdev() before return from function
hostap_enable_hostapd() in the error handling case.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: keucr: remove needless check before usb_free_coherent()
Wei Yongjun [Thu, 23 May 2013 09:28:34 +0000 (17:28 +0800)]
staging: keucr: remove needless check before usb_free_coherent()

usb_free_coherent() is safe with NULL addr and this check is
not required.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: tidy up the multi-line comments
H Hartley Sweeten [Thu, 23 May 2013 20:09:45 +0000 (13:09 -0700)]
staging: comedi: usbduxsigma: tidy up the multi-line comments

Modify the multi-line comments to follow the CodingStyle.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: remove a space before tab
H Hartley Sweeten [Thu, 23 May 2013 20:09:25 +0000 (13:09 -0700)]
staging: comedi: usbduxsigma: remove a space before tab

checkpatch.pl reports:

WARNING: please, no space before tabs
+^Ihigh_speed = 0; ^I/* (devpriv->high_speed) */$

Remove the space to avoid the warning.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: tidy up chanToInterval()
H Hartley Sweeten [Thu, 23 May 2013 20:09:08 +0000 (13:09 -0700)]
staging: comedi: usbduxsigma: tidy up chanToInterval()

Rename the function to have namespace associated with the driver.
Rename the CamelCase parameter 'nChannels' to avoid the checkpatch.pl
warning.

Tidy up the function a bit.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: add missing spaces reported by checkpatch.pl
H Hartley Sweeten [Thu, 23 May 2013 20:08:51 +0000 (13:08 -0700)]
staging: comedi: usbduxsigma: add missing spaces reported by checkpatch.pl

checkpatch.pl reports:

ERROR: space required after that ',' (ctx:VxV)
+               dev_dbg(dev->class_dev,"CRC error in ISO IN stream\n");
                                      ^

ERROR: spaces required around that '=' (ctx:VxW)
+       struct usbduxsigma_private *devpriv= dev->private;
                                           ^
Add the missing spaces to avoid the error.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: rename CamelCase vars in private data
H Hartley Sweeten [Thu, 23 May 2013 20:08:33 +0000 (13:08 -0700)]
staging: comedi: usbduxsigma: rename CamelCase vars in private data

Rename the CamelCase variables in the private data to avoid the
checkpatch.pl warning.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: remove some unused defines
H Hartley Sweeten [Thu, 23 May 2013 20:08:14 +0000 (13:08 -0700)]
staging: comedi: usbduxsigma: remove some unused defines

These defines are not used in the driver. Remove them.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: tidy up the usb endpoint defines
H Hartley Sweeten [Thu, 23 May 2013 20:07:53 +0000 (13:07 -0700)]
staging: comedi: usbduxsigma: tidy up the usb endpoint defines

Rename the defines so they have namespace associated with the driver.
Tidy up the defines.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: cleanup comedi_lrange table
H Hartley Sweeten [Thu, 23 May 2013 20:07:35 +0000 (13:07 -0700)]
staging: comedi: usbduxsigma: cleanup comedi_lrange table

Rename the table so it has namespace associated with the driver.
Tidy up the whitespace of the table.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: rename usbdux_{ai,ao}_stop() functions
H Hartley Sweeten [Thu, 23 May 2013 20:07:14 +0000 (13:07 -0700)]
staging: comedi: usbduxsigma: rename usbdux_{ai,ao}_stop() functions

Rename the functions so they have namespace associated with the driver.

For aesthetic reasons, pass the comedi_device pointer instead of the
private data pointer as the first parameter.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: rename the (*cancel) functions
H Hartley Sweeten [Thu, 23 May 2013 20:06:55 +0000 (13:06 -0700)]
staging: comedi: usbduxsigma: rename the (*cancel) functions

Rename these functions so they have namespace associated with the
driver.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: rename the urb completion handlers
H Hartley Sweeten [Thu, 23 May 2013 20:06:37 +0000 (13:06 -0700)]
staging: comedi: usbduxsigma: rename the urb completion handlers

Rename these functions so they have namespace associated with the
driver and their use is aparent.

Also, rename the #defines used for the bulk transfer commands and
move them up with the other defines.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: rename {send,receive}_dux_commands()
H Hartley Sweeten [Thu, 23 May 2013 20:06:18 +0000 (13:06 -0700)]
staging: comedi: usbduxsigma: rename {send,receive}_dux_commands()

Rename these functions so they have namespace associated with the
driver.

Also, rename the #defines used for the bulk transfer commands and
move them up with the other defines.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: check for invalid 'ao_timer' in all cases
H Hartley Sweeten [Thu, 23 May 2013 20:05:59 +0000 (13:05 -0700)]
staging: comedi: usbduxsigma: check for invalid 'ao_timer' in all cases

Make sure to check that the 'ao_timer' value is valid for both the
high speed and low speed cases in usbduxsigma_ao_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: tidy up analog input command support
H Hartley Sweeten [Thu, 23 May 2013 20:05:38 +0000 (13:05 -0700)]
staging: comedi: usbduxsigma: tidy up analog input command support

Rename the (*do_cmdtest) and (*do_cmd) functions so they have namespace
associated with the driver. Rename the local variable used for the
private data pointer.

Move all the command argument initialization and testing into the
(*do_cmdtest) function. That function is always called by the comedi
core before the (*do_cmd) function. The only thing the (*do_cmd) function
should have to do is setup the channel list, send the command to start
the analog input sampling, initialize the counter for the conversion,
then either read the acquisition data (submit the urbs) or set the
trigger to read the data later.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: tidy up usbdux_ai_insn_read()
H Hartley Sweeten [Thu, 23 May 2013 20:05:19 +0000 (13:05 -0700)]
staging: comedi: usbduxsigma: tidy up usbdux_ai_insn_read()

Rename the function so it has namespace associated with the driver.
Rename the local variable used for the private data pointer.

Return -EBUSY if an asynchronous command is running and the read cannot
be completed.

Propagate the errno if the receive_dux_command() fails.

Tidy up the function to make it more concise.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: cleanup the private data 'outBuffer'
H Hartley Sweeten [Thu, 23 May 2013 20:04:53 +0000 (13:04 -0700)]
staging: comedi: usbduxsigma: cleanup the private data 'outBuffer'

This buffer is used to cache the analog output values that are written
to the analog output channels. Currently it only caches the single
writes to the channels using the (*insn_write) callback. The async
command writes are not cached. The buffer is also being kzalloc'ed
during the attach of the driver to a size much larger that required.

Rename the CamelCase buffer and change it to an array in the private
data of the correct size to cache the analog output channel values.

Modify the analog output urb callback so it updates the cached values
with those used for the asynchronous command to allow readback after
the command completes.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: tidy up analog output (*insn_{read, write})
H Hartley Sweeten [Thu, 23 May 2013 20:04:31 +0000 (13:04 -0700)]
staging: comedi: usbduxsigma: tidy up analog output (*insn_{read, write})

Rename the functions so they have namespace associated with the driver.
Rename the local variable used for the private data pointer.

Return -EBUSY from the (*insn_write) function if an asynchronous command
is running that the write cannot be completed.

Don't save the cached value of the analog output for readback unless
the command to set it is successful.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: tidy up analog output command support
H Hartley Sweeten [Thu, 23 May 2013 20:04:11 +0000 (13:04 -0700)]
staging: comedi: usbduxsigma: tidy up analog output command support

Rename the (*do_cmdtest) and (*do_cmd) functions so they have namespace
associated with the driver. Rename the local variable used for the
private data pointer.

Move all the command argument initialization and testing into the
(*do_cmdtest) function. That function is always called by the comedi
core before the (*do_cmd) function. The only thing the (*do_cmd) function
should have to do is setup the channel list, initialize the counter for
the conversion, then either start the conversion (submit the urbs) or
set the trigger to start the conversion.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: rename usbdux_pwm_stop()
H Hartley Sweeten [Thu, 23 May 2013 20:03:45 +0000 (13:03 -0700)]
staging: comedi: usbduxsigma: rename usbdux_pwm_stop()

Rename the function so it has namespace associated with the driver.

For aesthetic reasons, pass the comedi_device pointer instead of the
private data pointer as the first parameter.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: rename usbdux_pwm_cancel()
H Hartley Sweeten [Thu, 23 May 2013 20:03:26 +0000 (13:03 -0700)]
staging: comedi: usbduxsigma: rename usbdux_pwm_cancel()

Rename the function so it has namespace associated with the driver.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: rename usbdux_pwm_irq()
H Hartley Sweeten [Thu, 23 May 2013 20:03:06 +0000 (13:03 -0700)]
staging: comedi: usbduxsigma: rename usbdux_pwm_irq()

Rename the function so it has namespace associated with the driver.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: tidy up usbdux_pwm_period()
H Hartley Sweeten [Thu, 23 May 2013 20:02:45 +0000 (13:02 -0700)]
staging: comedi: usbduxsigma: tidy up usbdux_pwm_period()

Rename the function so it has namespace associated with the driver.
Rename the local variable used for the private data pointer.

Modify the fx2delay calculation to remove the floating point values.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: change private data flags to bit fields
H Hartley Sweeten [Thu, 23 May 2013 20:02:25 +0000 (13:02 -0700)]
staging: comedi: usbduxsigma: change private data flags to bit fields

Change the type of all the true/false flags in the private data to
bit fields.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: remove 'interface' from the private data
H Hartley Sweeten [Thu, 23 May 2013 20:01:56 +0000 (13:01 -0700)]
staging: comedi: usbduxsigma: remove 'interface' from the private data

This back pointer to the usb_interface is not used, remove it.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: remove some dev_{level} noise
H Hartley Sweeten [Thu, 23 May 2013 20:01:18 +0000 (13:01 -0700)]
staging: comedi: usbduxsigma: remove some dev_{level} noise

Remove the dev_err() and dev_dbg() messages that are just kernel
noise.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: tidy up usbdux_dio_insn_config()
H Hartley Sweeten [Thu, 23 May 2013 20:00:56 +0000 (13:00 -0700)]
staging: comedi: usbduxsigma: tidy up usbdux_dio_insn_config()

Rename the function so it has namespace associated with the driver.
Rename the local variable used for the private data pointer.
Add a local variable for the channel mask.

Remove the unnecessary comments and clean up the multi-line comment
at the end.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: tidy up usbdux_dio_insn_bits()
H Hartley Sweeten [Thu, 23 May 2013 20:00:36 +0000 (13:00 -0700)]
staging: comedi: usbduxsigma: tidy up usbdux_dio_insn_bits()

Rename the function so it has namespace associated with the driver.
Rename the local variable used for the private data pointer.
Remove the unnecessary casts.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: tidy up usbdux_pwm_start()
H Hartley Sweeten [Thu, 23 May 2013 19:59:24 +0000 (12:59 -0700)]
staging: comedi: usbduxsigma: tidy up usbdux_pwm_start()

Rename the function so it has namespace associated with the driver.
Rename the local variable used for the private data pointer.

Remove the unnecessary cast of the pwm delay.

Use memset to initialize the buffer instead of the for loop.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: tidy up usbdux_pwm_pattern()
H Hartley Sweeten [Thu, 23 May 2013 19:58:43 +0000 (12:58 -0700)]
staging: comedi: usbduxsigma: tidy up usbdux_pwm_pattern()

Rename the function so it has namespace associated with the driver.

Tidy up the function to make it more concise.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: tidy up usbdux_pwm_write()
H Hartley Sweeten [Thu, 23 May 2013 19:58:23 +0000 (12:58 -0700)]
staging: comedi: usbduxsigma: tidy up usbdux_pwm_write()

Rename the function so it has namespace associated with the driver.

Tidy up the comments.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: remove usbdux_pwm_read()
H Hartley Sweeten [Thu, 23 May 2013 19:58:04 +0000 (12:58 -0700)]
staging: comedi: usbduxsigma: remove usbdux_pwm_read()

The comment says its not needed, just remove it.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: tidy up usbduxsigma_pwm_config()
H Hartley Sweeten [Thu, 23 May 2013 19:57:45 +0000 (12:57 -0700)]
staging: comedi: usbduxsigma: tidy up usbduxsigma_pwm_config()

Rename the function so it has namespace associated with the driver.
Rename the local variable used for the private data pointer.

Remove some unnecessary comments and tidy up the comment about the
parameters for the INSN_CONFIG_PWM_SET_H_BRIDGE instruction.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: move usbduxsigma_firmware_upload()
H Hartley Sweeten [Thu, 23 May 2013 19:57:25 +0000 (12:57 -0700)]
staging: comedi: usbduxsigma: move usbduxsigma_firmware_upload()

For aesthetics, move this function near its caller. Also, move the
FIRMWARE_MAX_LEN define so its with the other firmware constants
and fix the whitespace.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: remove an extra ';'
H Hartley Sweeten [Thu, 23 May 2013 19:56:59 +0000 (12:56 -0700)]
staging: comedi: usbduxsigma: remove an extra ';'

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: tidy up tidy_up()
H Hartley Sweeten [Thu, 23 May 2013 19:56:36 +0000 (12:56 -0700)]
staging: comedi: usbduxsigma: tidy up tidy_up()

Rename the function so it has namespace associated with the driver.

For aesthetic reasons, move the function so it's near the one that
allocates the usb buffers.

Tidy up the function so it frees the buffers in the opposite order
they were allocated. Also remove the = NULL for all the buffers,
the driver is being detached so the comedi core will kfree the
private data.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: kill all urbs before freeing them
H Hartley Sweeten [Thu, 23 May 2013 19:56:12 +0000 (12:56 -0700)]
staging: comedi: usbduxsigma: kill all urbs before freeing them

For aesthetic reasons, kill all the urbs before freeing them.
Also, remove a redundant killing of the ai and ao urbs in the
(*detach).

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: move usb_set_intfdata(intf, NULL) to (*detach)
H Hartley Sweeten [Thu, 23 May 2013 19:55:48 +0000 (12:55 -0700)]
staging: comedi: usbduxsigma: move usb_set_intfdata(intf, NULL) to (*detach)

For aesthetic reasons, move the clearing of the interface data to
the (*detach) since its set in the (*auto_attach).

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: usbduxsigma: remove tidy_up() from (*auto_attach)
H Hartley Sweeten [Thu, 23 May 2013 19:55:28 +0000 (12:55 -0700)]
staging: comedi: usbduxsigma: remove tidy_up() from (*auto_attach)

Comedi drivers do not need to cleanup allocations during the
(*auto_attach). If the (*auto_attach) fails the (*detach) will
automatically be called to handle the cleanup.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>