openwrt/staging/blogic.git
10 years agostaging: vt6656: s_nsBulkInUsbIoCompleteRead check that used sk_buff is clean and...
Malcolm Priestley [Sun, 6 Jul 2014 22:19:46 +0000 (23:19 +0100)]
staging: vt6656: s_nsBulkInUsbIoCompleteRead check that used sk_buff is clean and ready to reuse.

skb_push the headroom and trimmed back to 0

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6655: fixed sparse warnings
Anton Protopopov [Tue, 1 Jul 2014 17:06:29 +0000 (21:06 +0400)]
staging: vt6655: fixed sparse warnings

This commit fixes a few sparse warnings for missing the 'static' keyword
in array definitions:
    drivers/staging//vt6655/rxtx.c:81:22: warning: symbol 'wTimeStampOff' was not declared. Should it be static?
    drivers/staging//vt6655/rxtx.c:86:22: warning: symbol 'wFB_Opt0' was not declared. Should it be static?
    drivers/staging//vt6655/rxtx.c:90:22: warning: symbol 'wFB_Opt1' was not declared. Should it be static?

Signed-off-by: Anton Protopopov <a.s.protopopov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostagingL vt6656: implement fall back rates reporting.
Malcolm Priestley [Sat, 5 Jul 2014 18:24:27 +0000 (19:24 +0100)]
stagingL vt6656: implement fall back rates reporting.

The driver reports the rate tried in struct vnt_interrupt_data tsr* variables
which is available in INTnsProcessData via interrupt urb context.

Instead of closing apTD tx context in s_nsBulkOutIoCompleteWrite by setting
in_use to false. Keep the context open and allow vnt_int_report_rate to
close it.

If the tx_retry value is correct it will report back the sucessful RATE tried.

struct vnt_usb_send_context add pkt_no which is index of apTD

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: Include re_alloc_skb within lock.
Malcolm Priestley [Sat, 5 Jul 2014 18:24:26 +0000 (19:24 +0100)]
staging: vt6656: Include re_alloc_skb within lock.

Remove variable re_alloc_skb and merge code within urb->actual_length.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: vnt_set_channel remove power setting functions
Malcolm Priestley [Sat, 5 Jul 2014 18:24:25 +0000 (19:24 +0100)]
staging: vt6656: vnt_set_channel remove power setting functions

Power setting is already done in vnt_config and vnt_tx_packet.

Just check that for connection_channel, if invalid return.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: vnt_rx_data add track rsr and new_rsr errors
Malcolm Priestley [Sat, 5 Jul 2014 18:24:24 +0000 (19:24 +0100)]
staging: vt6656: vnt_rx_data add track rsr and new_rsr errors

Add rsr and new_rsr error packet error drop.

if NEWRSR_DECRYPTOK fails drop packet altogether.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: vnt_tx_packet don't change power when off channel.
Malcolm Priestley [Sat, 5 Jul 2014 18:24:23 +0000 (19:24 +0100)]
staging: vt6656: vnt_tx_packet don't change power when off channel.

The changing channel is so fast when off channel that changing power is pointless.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: vnt_rf_setpower rate <= RATE_11M check array bound
Malcolm Priestley [Sat, 5 Jul 2014 18:24:22 +0000 (19:24 +0100)]
staging: vt6656: vnt_rf_setpower rate <= RATE_11M check array bound

decrement channel by one and check array bound.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: vnt_rf_set_txpower use power for priv->byCurPwr
Malcolm Priestley [Sat, 5 Jul 2014 18:24:21 +0000 (19:24 +0100)]
staging: vt6656: vnt_rf_set_txpower use power for priv->byCurPwr

The byCurPwr value can change state while in another thread,.

Change to local variable power which is the last set value.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: turn radio off after mac registered.
Malcolm Priestley [Sat, 5 Jul 2014 18:24:20 +0000 (19:24 +0100)]
staging: vt6656: turn radio off after mac registered.

Turn the radio off to save power is the device is unused
on system.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: s_nsBulkOutIoCompleteWrite fix bug of 5GHZ a rates idx
Malcolm Priestley [Sun, 29 Jun 2014 19:39:55 +0000 (20:39 +0100)]
staging: vt6656: s_nsBulkOutIoCompleteWrite fix bug of 5GHZ a rates idx

On 2GHz band the values of wCurrentRate match the idx rates.

However, on 5GHz they do not because in channel.c vnt_rates_a do not
match idx.

Instead use the info->control.rates[0].idx the value that was tried.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: implement get_stats ieee80211_low_level_stats
Malcolm Priestley [Sun, 29 Jun 2014 19:39:54 +0000 (20:39 +0100)]
staging: vt6656: implement get_stats ieee80211_low_level_stats

The driver already report low_level_stats via vnt_interrupt_data.

Allow mac80211 to collect them via vnt_get_stats

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: Add void declarations in zero-arg functions.
Chi Pham [Thu, 3 Jul 2014 13:03:59 +0000 (15:03 +0200)]
staging: ced1401: Add void declarations in zero-arg functions.

Added explicit void declarations to zero-argument function headers.
The following coccinelle script was used:
@addvoid@
identifier f;
@@

f(
+ void
 ) { ... }

Signed-off-by: Chi Pham <fempsci@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: remove typedef for CIRCBLK
Luca Ellero [Mon, 30 Jun 2014 10:00:45 +0000 (12:00 +0200)]
staging: ced1401: remove typedef for CIRCBLK

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename FreeCircBlock()
Luca Ellero [Mon, 30 Jun 2014 10:00:44 +0000 (12:00 +0200)]
staging: ced1401: rename FreeCircBlock()

rename camel case function FreeCircBlock() to ced_free_circ_block()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename GetCircBlock()
Luca Ellero [Mon, 30 Jun 2014 10:00:43 +0000 (12:00 +0200)]
staging: ced1401: rename GetCircBlock()

rename camel case function GetCircBlock() to ced_get_circ_block()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename SetCircular()
Luca Ellero [Mon, 30 Jun 2014 10:00:42 +0000 (12:00 +0200)]
staging: ced1401: rename SetCircular()

rename camel case function SetCircular() to ced_set_circular()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename DbgStopLoop()
Luca Ellero [Mon, 30 Jun 2014 10:00:41 +0000 (12:00 +0200)]
staging: ced1401: rename DbgStopLoop()

rename camel case function DbgStopLoop() to ced_dbg_stop_loop()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename DbgGetData()
Luca Ellero [Mon, 30 Jun 2014 10:00:40 +0000 (12:00 +0200)]
staging: ced1401: rename DbgGetData()

rename camel case function DbgGetData() to ced_dbg_get_data()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename DbgRampAddr()
Luca Ellero [Mon, 30 Jun 2014 10:00:39 +0000 (12:00 +0200)]
staging: ced1401: rename DbgRampAddr()

rename camel case function DbgRampAddr() to ced_dbg_ramp_addr()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename DbgRampData()
Luca Ellero [Mon, 30 Jun 2014 10:00:38 +0000 (12:00 +0200)]
staging: ced1401: rename DbgRampData()

rename camel case function DbgRampData() to ced_dbg_ramp_data()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename DbgPoke()
Luca Ellero [Mon, 30 Jun 2014 10:00:37 +0000 (12:00 +0200)]
staging: ced1401: rename DbgPoke()

rename camel case function DbgPoke() to ced_dbg_poke()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename DbgPeek()
Luca Ellero [Mon, 30 Jun 2014 10:00:36 +0000 (12:00 +0200)]
staging: ced1401: rename DbgPeek()

rename camel case function DbgPeek() to ced_dbg_peek()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename DbgCmd1401()
Luca Ellero [Mon, 30 Jun 2014 10:00:35 +0000 (12:00 +0200)]
staging: ced1401: rename DbgCmd1401()

rename camel case function DbgCmd1401() to ced_dbg_cmd()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename TransferFlags()
Luca Ellero [Mon, 30 Jun 2014 10:00:34 +0000 (12:00 +0200)]
staging: ced1401: rename TransferFlags()

rename camel case function TransferFlags() to ced_transfer_flags()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename TypeOf1401()
Luca Ellero [Mon, 30 Jun 2014 10:00:33 +0000 (12:00 +0200)]
staging: ced1401: rename TypeOf1401()

rename camel case function TypeOf1401() to ced_type_of_1401()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename CheckSelfTest()
Luca Ellero [Mon, 30 Jun 2014 10:00:32 +0000 (12:00 +0200)]
staging: ced1401: rename CheckSelfTest()

rename camel case function CheckSelfTest() to ced_check_self_test()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename StartSelfTest()
Luca Ellero [Mon, 30 Jun 2014 10:00:31 +0000 (12:00 +0200)]
staging: ced1401: rename StartSelfTest()

rename camel case function StartSelfTest() to ced_start_self_test()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename StateOf1401()
Luca Ellero [Mon, 30 Jun 2014 10:00:30 +0000 (12:00 +0200)]
staging: ced1401: rename StateOf1401()

rename camel case function StateOf1401() to ced_state_of_1401()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: remove unused func BlkTransState
Luca Ellero [Mon, 30 Jun 2014 10:00:29 +0000 (12:00 +0200)]
staging: ced1401: remove unused func BlkTransState

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename KillIO1401()
Luca Ellero [Mon, 30 Jun 2014 09:58:16 +0000 (11:58 +0200)]
staging: ced1401: rename KillIO1401()

rename camel case function KillIO1401() to ced_kill_io()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename GetTransfer()
Luca Ellero [Mon, 30 Jun 2014 09:58:15 +0000 (11:58 +0200)]
staging: ced1401: rename GetTransfer()

rename camel case function GetTransfer() to ced_get_transfer()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename TestEvent()
Luca Ellero [Mon, 30 Jun 2014 09:58:14 +0000 (11:58 +0200)]
staging: ced1401: rename TestEvent()

rename camel case function TestEvent() to ced_test_event()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename WaitEvent()
Luca Ellero [Mon, 30 Jun 2014 09:58:13 +0000 (11:58 +0200)]
staging: ced1401: rename WaitEvent()

rename camel case function WaitEvent() to ced_wait_event()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename SetEvent()
Luca Ellero [Mon, 30 Jun 2014 09:58:12 +0000 (11:58 +0200)]
staging: ced1401: rename SetEvent()

rename camel case function SetEvent() to ced_set_event()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename UnsetTransfer()
Luca Ellero [Mon, 30 Jun 2014 09:58:11 +0000 (11:58 +0200)]
staging: ced1401: rename UnsetTransfer()

rename camel case function UnsetTransfer() to ced_unset_transfer()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename SetTransfer()
Luca Ellero [Mon, 30 Jun 2014 09:58:10 +0000 (11:58 +0200)]
staging: ced1401: rename SetTransfer()

rename camel case function SetTransfer() to ced_set_transfer()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename SetArea()
Luca Ellero [Mon, 30 Jun 2014 09:58:09 +0000 (11:58 +0200)]
staging: ced1401: rename SetArea()

rename camel case function SetArea() to ced_set_area()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename ClearArea()
Luca Ellero [Mon, 30 Jun 2014 09:58:08 +0000 (11:58 +0200)]
staging: ced1401: rename ClearArea()

rename camel case function ClearArea() to ced_clear_area()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename GetOutBufSpace()
Luca Ellero [Mon, 30 Jun 2014 09:58:07 +0000 (11:58 +0200)]
staging: ced1401: rename GetOutBufSpace()

rename camel case function GetOutBufSpace() to ced_get_out_buf_space()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename LineCount()
Luca Ellero [Mon, 30 Jun 2014 09:58:06 +0000 (11:58 +0200)]
staging: ced1401: rename LineCount()

rename camel case function LineCount() to ced_line_count()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename Stat1401()
Luca Ellero [Mon, 30 Jun 2014 09:58:05 +0000 (11:58 +0200)]
staging: ced1401: rename Stat1401()

rename camel case function Stat1401() to ced_stat_1401()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename GetString()
Luca Ellero [Mon, 30 Jun 2014 09:58:04 +0000 (11:58 +0200)]
staging: ced1401: rename GetString()

rename camel case function GetString() to ced_get_string()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename Reset1401()
Luca Ellero [Mon, 30 Jun 2014 09:58:03 +0000 (11:58 +0200)]
staging: ced1401: rename Reset1401()

rename camel case function Reset1401() to ced_reset()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename QuickCheck()
Luca Ellero [Mon, 30 Jun 2014 09:58:02 +0000 (11:58 +0200)]
staging: ced1401: rename QuickCheck()

rename camel case function QuickCheck() to ced_quick_check() and make it
static

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: make ced_is_1401() static
Luca Ellero [Mon, 30 Jun 2014 09:58:01 +0000 (11:58 +0200)]
staging: ced1401: make ced_is_1401() static

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename Is1401()
Luca Ellero [Mon, 30 Jun 2014 09:58:00 +0000 (11:58 +0200)]
staging: ced1401: rename Is1401()

rename camel case function Is1401() to ced_is_1401()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename InSelfTest()
Luca Ellero [Mon, 30 Jun 2014 09:57:59 +0000 (11:57 +0200)]
staging: ced1401: rename InSelfTest()

rename camel case function InSelfTest() to ced_in_self_test()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename ReadWrite_Cancel()
Luca Ellero [Mon, 30 Jun 2014 09:57:58 +0000 (11:57 +0200)]
staging: ced1401: rename ReadWrite_Cancel()

rename camel case function ReadWrite_Cancel() to ced_read_write_cancel()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename Get1401State()
Luca Ellero [Mon, 30 Jun 2014 09:57:57 +0000 (11:57 +0200)]
staging: ced1401: rename Get1401State()

rename camel case function Get1401State() to ced_get_state()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename SendChar()
Luca Ellero [Mon, 30 Jun 2014 09:57:56 +0000 (11:57 +0200)]
staging: ced1401: rename SendChar()

rename camel case function SendChar() to ced_send_char()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename SendString()
Luca Ellero [Mon, 30 Jun 2014 09:57:55 +0000 (11:57 +0200)]
staging: ced1401: rename SendString()

rename camel case function SendString() to ced_send_string()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename PutChars()
Luca Ellero [Mon, 30 Jun 2014 09:57:54 +0000 (11:57 +0200)]
staging: ced1401: rename PutChars()

rename camel case function PutChars() to ced_put_chars()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename FlushInBuff()
Luca Ellero [Mon, 30 Jun 2014 09:57:53 +0000 (11:57 +0200)]
staging: ced1401: rename FlushInBuff()

rename camel case function FlushInBuff() to ced_flush_in_buff()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename FlushOutBuff()
Luca Ellero [Mon, 30 Jun 2014 09:57:52 +0000 (11:57 +0200)]
staging: ced1401: rename FlushOutBuff()

rename camel case function FlushOutBuff() to ced_flush_out_buff()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename Allowi()
Luca Ellero [Mon, 30 Jun 2014 09:57:51 +0000 (11:57 +0200)]
staging: ced1401: rename Allowi()

rename camel case function Allowi() to ced_allowi()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename Handle1401Esc()
Luca Ellero [Mon, 30 Jun 2014 09:57:50 +0000 (11:57 +0200)]
staging: ced1401: rename Handle1401Esc()

rename camel case function Handle1401Esc() to ced_handle_esc()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename ReadDMAInfo()
Luca Ellero [Mon, 30 Jun 2014 09:57:49 +0000 (11:57 +0200)]
staging: ced1401: rename ReadDMAInfo()

rename camel case function ReadDMAInfo() to ced_read_dma_info()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename ReadHuff()
Luca Ellero [Mon, 30 Jun 2014 09:57:48 +0000 (11:57 +0200)]
staging: ced1401: rename ReadHuff()

rename camel case function ReadHuff() to ced_read_huff()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename ReadWord()
Luca Ellero [Mon, 30 Jun 2014 09:57:47 +0000 (11:57 +0200)]
staging: ced1401: rename ReadWord()

rename camel case function ReadWord() to ced_read_word()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename ReadChar()
Luca Ellero [Mon, 30 Jun 2014 09:57:46 +0000 (11:57 +0200)]
staging: ced1401: rename ReadChar()

rename camel case function ReadChar() to ced_read_char()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename ReadWriteMem()
Luca Ellero [Mon, 30 Jun 2014 09:57:45 +0000 (11:57 +0200)]
staging: ced1401: rename ReadWriteMem()

rename camel case function ReadWriteMem() to ced_read_write_mem()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename StageChunk()
Luca Ellero [Mon, 30 Jun 2014 09:57:44 +0000 (11:57 +0200)]
staging: ced1401: rename StageChunk()

rename camel case function StageChunk() to ced_stage_chunk()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename CopyUserSpace()
Luca Ellero [Mon, 30 Jun 2014 09:57:43 +0000 (11:57 +0200)]
staging: ced1401: rename CopyUserSpace()

rename camel case function CopyUserSpace() to ced_copy_user_space()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename SendChars()
Luca Ellero [Mon, 30 Jun 2014 09:57:42 +0000 (11:57 +0200)]
staging: ced1401: rename SendChars()

rename camel case function SendChars() to ced_send_chars()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ced1401: rename CanAcceptIoRequests()
Luca Ellero [Mon, 30 Jun 2014 09:57:41 +0000 (11:57 +0200)]
staging: ced1401: rename CanAcceptIoRequests()

rename camel case function CanAcceptIoRequests() to can_accept_io_requests()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove unnecessary null test before kfree
Fabian Frederick [Tue, 1 Jul 2014 08:11:23 +0000 (10:11 +0200)]
staging: rtl8723au: Remove unnecessary null test before kfree

Fix checkpatch warning:
WARNING: kfree(NULL) is safe this check is probably not required

Cc: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Jes Sorensen <Jes.Sorensen@redhat.com>
Cc: linux-wireless@vger.kernel.org
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Simplify _BlockWrite() based on saner rtl8723au_writeN()
Jes Sorensen [Tue, 1 Jul 2014 08:11:22 +0000 (10:11 +0200)]
staging: rtl8723au: Simplify _BlockWrite() based on saner rtl8723au_writeN()

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Sanitize USB read/write functions
Jes Sorensen [Tue, 1 Jul 2014 10:07:00 +0000 (12:07 +0200)]
staging: rtl8723au: Sanitize USB read/write functions

The original Realtek provided functions suffered badly from clutter to
accommodate broken operating systems. Lets try this lean and clean
version instead.

v2: Do not use the stack for data passed to usb_control_msg(). This
    requires reintroducing the mutex used in the old function. In
    addition, get rid of the no longer used 'usb_vendor_req_buf'.
    Note that rtl8723au_writeN() remains unlocked, so it can be used
    for bulk block transfers without having to retake the mutex for
    every write().

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove never set struct rtw_adapter->bNotifyChannelChange
Jes Sorensen [Tue, 1 Jul 2014 08:11:20 +0000 (10:11 +0200)]
staging: rtl8723au: Remove never set struct rtw_adapter->bNotifyChannelChange

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: pwrctrl_priv->ps_flag is never set
Jes Sorensen [Tue, 1 Jul 2014 08:11:19 +0000 (10:11 +0200)]
staging: rtl8723au: pwrctrl_priv->ps_flag is never set

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: pnp_bstop_trx is never set
Jes Sorensen [Tue, 1 Jul 2014 08:11:18 +0000 (10:11 +0200)]
staging: rtl8723au: pnp_bstop_trx is never set

In addition remove unused pnp_current_pwr_state

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove unused variables from struct pwrctrl_priv
Jes Sorensen [Tue, 1 Jul 2014 08:11:17 +0000 (10:11 +0200)]
staging: rtl8723au: Remove unused variables from struct pwrctrl_priv

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove unused pwrctrl_priv->brfoffbyhw
Jes Sorensen [Tue, 1 Jul 2014 08:11:16 +0000 (10:11 +0200)]
staging: rtl8723au: Remove unused pwrctrl_priv->brfoffbyhw

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Fold power_saving_wk_hdl() into rtw_drvextra_cmd_hdl23a()
Jes Sorensen [Tue, 1 Jul 2014 08:11:15 +0000 (10:11 +0200)]
staging: rtl8723au: Fold power_saving_wk_hdl() into rtw_drvextra_cmd_hdl23a()

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Clean up rtw_pm_set_ips23a()
Jes Sorensen [Tue, 1 Jul 2014 08:11:14 +0000 (10:11 +0200)]
staging: rtl8723au: Clean up rtw_pm_set_ips23a()

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: android: logger: fixed checkpatch.pl warnings.
Jerry Stralko [Tue, 1 Jul 2014 11:13:18 +0000 (07:13 -0400)]
staging: android: logger: fixed checkpatch.pl warnings.

Signed-off-by: Jerry Stralko <gerb.stralko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agodrivers: staging: android: ion: Kconfig: Let it also depend on HAS_DMA
Chen Gang [Mon, 7 Jul 2014 08:49:24 +0000 (16:49 +0800)]
drivers: staging: android: ion: Kconfig: Let it also depend on HAS_DMA

ION need HAS_DMA (e.g. need DMA_SHARED_BUFFER), so it has to depend on
HAS_DMA, or can not pass compiling with allmodconfig under score which
NO_DMA.  And the related error:

    CC      drivers/staging/android/ion/ion_cma_heap.o
  drivers/staging/android/ion/ion_cma_heap.c: In function 'ion_cma_mmap':
  drivers/staging/android/ion/ion_cma_heap.c:168:2: error: implicit declaration of function 'dma_mmap_coherent' [-Werror=implicit-function-declaration]
    return dma_mmap_coherent(dev, vma, info->cpu_addr, info->handle,
    ^
  cc1: some warnings being treated as errors
  make[4]: *** [drivers/staging/android/ion/ion_cma_heap.o] Error 1
  make[3]: *** [drivers/staging/android/ion] Error 2
  make[2]: *** [drivers/staging/android] Error 2
  make[1]: *** [drivers/staging] Error 2
  make: *** [drivers] Error 2

Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: android: binder.c: binder_ioctl() cleanup
Tair Rzayev [Tue, 3 Jun 2014 19:27:21 +0000 (22:27 +0300)]
staging: android: binder.c: binder_ioctl() cleanup

binder_ioctl() is quite huge and checkpatch dirty - mostly because of
the amount of code for the BINDER_WRITE_READ and BINDER_SET_CONTEXT_MGR.
Moved that code into the new binder_ioctl_write_read() and
binder_ioctl_set_ctx_mgr()

Signed-off-by: Tair Rzayev <tair.rzayev@gmail.com>
Cc: Arve Hjønnevåg <arve@android.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: binder: add vm_fault handler
Vinayak Menon [Mon, 2 Jun 2014 12:47:59 +0000 (18:17 +0530)]
staging: binder: add vm_fault handler

An issue was observed when a userspace task exits.
The page which hits error here is the zero page.
In binder mmap, the whole of vma is not mapped.
On a task crash, when debuggerd reads the binder regions,
the unmapped areas fall to do_anonymous_page in handle_pte_fault,
due to the absence of a vm_fault handler. This results in
zero page being mapped. Later in zap_pte_range, vm_normal_page
returns zero page in the case of VM_MIXEDMAP and it results in the
error.

BUG: Bad page map in process mediaserver  pte:9dff379f pmd:9bfbd831
page:c0ed8e60 count:1 mapcount:-1 mapping:  (null) index:0x0
page flags: 0x404(referenced|reserved)
addr:40c3f000 vm_flags:10220051 anon_vma:  (null) mapping:d9fe0764 index:fd
vma->vm_ops->fault:   (null)
vma->vm_file->f_op->mmap: binder_mmap+0x0/0x274
CPU: 0 PID: 1463 Comm: mediaserver Tainted: G        W    3.10.17+ #1
[<c001549c>] (unwind_backtrace+0x0/0x11c) from [<c001200c>] (show_stack+0x10/0x14)
[<c001200c>] (show_stack+0x10/0x14) from [<c0103d78>] (print_bad_pte+0x158/0x190)
[<c0103d78>] (print_bad_pte+0x158/0x190) from [<c01055f0>] (unmap_single_vma+0x2e4/0x598)
[<c01055f0>] (unmap_single_vma+0x2e4/0x598) from [<c010618c>] (unmap_vmas+0x34/0x50)
[<c010618c>] (unmap_vmas+0x34/0x50) from [<c010a9e4>] (exit_mmap+0xc8/0x1e8)
[<c010a9e4>] (exit_mmap+0xc8/0x1e8) from [<c00520f0>] (mmput+0x54/0xd0)
[<c00520f0>] (mmput+0x54/0xd0) from [<c005972c>] (do_exit+0x360/0x990)
[<c005972c>] (do_exit+0x360/0x990) from [<c0059ef0>] (do_group_exit+0x84/0xc0)
[<c0059ef0>] (do_group_exit+0x84/0xc0) from [<c0066de0>] (get_signal_to_deliver+0x4d4/0x548)
[<c0066de0>] (get_signal_to_deliver+0x4d4/0x548) from [<c0011500>] (do_signal+0xa8/0x3b8)

Add a vm_fault handler which returns VM_FAULT_SIGBUS, and prevents the
wrong fallback to do_anonymous_page.

Signed-off-by: Vinayak Menon <vinayakm.list@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: unisys: remove all proc entries from virtpci
Erik Arfvidson [Tue, 8 Jul 2014 17:21:30 +0000 (13:21 -0400)]
staging: unisys: remove all proc entries from virtpci

This patch removes all proc entries from virtpci

Signed-off-by: Erik Arfvidson <erik.arfvidson@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: unisys: Fix noderef sparse warnings in vbusdeviceinfo.h
Ken Cox [Thu, 3 Jul 2014 15:02:18 +0000 (10:02 -0500)]
Staging: unisys: Fix noderef sparse warnings in vbusdeviceinfo.h

vbuschannel_devinfo_to_string() was declared with the devinfo argument
as a pointer to __iomem space.  No callers of this function need the
__iomem space, so I removed that constraint.

Same thing goes for vbuschannel_sanitize_buffer().  It doesn't need to
operate on I/O space.

Signed-off-by: Ken Cox <jkc@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: unisys: Remove ultra_vbus_init_channel function
Ken Cox [Thu, 3 Jul 2014 15:02:17 +0000 (10:02 -0500)]
Staging: unisys: Remove ultra_vbus_init_channel function

The function ultra_vbus_init_channel() is never called since
previous server code was removed.  Remove the dead code.

Signed-off-by: Ken Cox <jkc@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: unisys: Remove isServer arg from init_vbus_channel()
Ken Cox [Thu, 3 Jul 2014 15:02:16 +0000 (10:02 -0500)]
Staging: unisys: Remove isServer arg from init_vbus_channel()

The init_vbus_channel() function is never called with the isServer
argument equal to TRUE, so just get rid of the argument altogether.
This also means that the code in the function that would be executed
in the server case can be removed since it is never executed.

Signed-off-by: Ken Cox <jkc@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: unisys: use Linux coding convention for function names
Ken Cox [Thu, 3 Jul 2014 15:02:15 +0000 (10:02 -0500)]
Staging: unisys: use Linux coding convention for function names

Change function names to conform to Linux kernel coding convention.
    ULTRA_VBUS_init_channel() --> ultra_vbus_init_channel()
    VBUSCHANNEL_devInfoToStringBuffer() --> vbuschannel_devinfo_to_string()
    VBUSCHANNEL_sanitize_buffer() --> vbuschannel_sanitize_buffer()
    VBUSCHANNEL_itoa() --> vbuschannel_itoa()

Signed-off-by: Ken Cox <jkc@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging:unisys: Add Kconfig dependency on UNISYS_VISORUTIL to UNISYS_CHANNELSTUB
Ken Cox [Mon, 30 Jun 2014 13:06:33 +0000 (08:06 -0500)]
Staging:unisys: Add Kconfig dependency on UNISYS_VISORUTIL to UNISYS_CHANNELSTUB

The visorchannelstub module references the variable unisys_spar_platform
which is declared in the visorutil module.  Add the proper dependency to
Kconfig to ensure that visorutil is enabled when building visorchannelstub.

This address the build error:
   drivers/built-in.o: In function `channel_mod_init':
   chanstub.c:(.init.text+0xbe24): undefined reference to `unisys_spar_platform'

Reported by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Ken Cox <jkc@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoMerge branch 'component-for-staging' of git://ftp.arm.linux.org.uk/~rmk/linux-arm...
Greg Kroah-Hartman [Tue, 8 Jul 2014 01:41:23 +0000 (18:41 -0700)]
Merge branch 'component-for-staging' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into staging-next

Russell writes:

This updates imx-drm for the recently merged updates to the component
helper, and as such is based upon the previously pulled updates
(including the recent fix) into the the driver tree.

10 years agoMerge 3.16-rc4 into staging-next
Greg Kroah-Hartman [Tue, 8 Jul 2014 00:59:07 +0000 (17:59 -0700)]
Merge 3.16-rc4 into staging-next

We want the staging tree fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoLinux 3.16-rc4
Linus Torvalds [Sun, 6 Jul 2014 19:37:51 +0000 (12:37 -0700)]
Linux 3.16-rc4

10 years agoMerge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux
Linus Torvalds [Sun, 6 Jul 2014 19:11:57 +0000 (12:11 -0700)]
Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux

Pull devicetree bugfix from Grant Likely:
 "Important bug fix for parsing 64-bit addresses on 32-bit platforms.
  Without this patch the kernel will try to use memory ranges that
  cannot be reached"

* tag 'dt-for-linus' of git://git.secretlab.ca/git/linux:
  of: Check for phys_addr_t overflows in early_init_dt_add_memory_arch

10 years agoMerge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb...
Linus Torvalds [Sun, 6 Jul 2014 19:08:30 +0000 (12:08 -0700)]
Merge tag 'scsi-for-linus' of git://git./linux/kernel/git/jejb/scsi

Pull SCSI fixes from James Bottomley:
 "This is a set of 13 fixes, a MAINTAINERS update and a sparse update.
  The fixes are mostly correct value initialisations, avoiding NULL
  derefs and some uninitialised pointer avoidance.

  All the patches have been incubated in -next for a few days.  The
  final patch (use the scsi data buffer length to extract transfer size)
  has been rebased to add a cc to stable, but only the commit message
  has changed"

* tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  [SCSI] use the scsi data buffer length to extract transfer size
  virtio-scsi: fix various bad behavior on aborted requests
  virtio-scsi: avoid cancelling uninitialized work items
  ibmvscsi: Add memory barriers for send / receive
  ibmvscsi: Abort init sequence during error recovery
  qla2xxx: Fix sparse warning in qla_target.c.
  bnx2fc: Improve stats update mechanism
  bnx2fc: do not scan uninitialized lists in case of error.
  fc: ensure scan_work isn't active when freeing fc_rport
  pm8001: Fix potential null pointer dereference and memory leak.
  MAINTAINERS: Update LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI) maintainers Email IDs
  be2iscsi: remove potential junk pointer free
  be2iscsi: add an missing goto in error path
  scsi_error: set DID_TIME_OUT correctly
  scsi_error: fix invalid setting of host byte

10 years agoMerge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Linus Torvalds [Sun, 6 Jul 2014 00:13:46 +0000 (17:13 -0700)]
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Pull drm fixes from Dave Airlie:
 "i915, tda998x and vmwgfx fixes,

  The main one is i915 fix for missing VGA connectors, along with some
  fixes for the tda998x from Russell fixing some modesetting problems.

  (still on holidays, but got a spare moment to find these)"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/vmwgfx: Fix incorrect write to read-only register v2:
  drm/i915: Drop early VLV WA to fix Voltage not getting dropped to Vmin
  drm/i915: only apply crt_present check on VLV
  drm/i915: Wait for vblank after enabling the primary plane on BDW
  drm/i2c: tda998x: add some basic mode validation
  drm/i2c: tda998x: faster polling for edid
  drm/i2c: tda998x: move drm_i2c_encoder_destroy call

10 years agoMerge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
Linus Torvalds [Sat, 5 Jul 2014 23:57:12 +0000 (16:57 -0700)]
Merge tag 'fixes-for-linus' of git://git./linux/kernel/git/arm/arm-soc

Pull ARM SoC fixes from Olof Johansson:
 "This week's arm-soc fixes:

   - A set of of OMAP patches that we had missed Tony's pull request of:
     * Reset fix for am43xx
     * Proper OPP table for omap5
     * Fix for SoC detection of one of the DRA7 SoCs
     * hwmod updates to get SATA and OCP to work on omap5 (drivers
       merged in 3.16)
     * ... plus a handful of smaller fixes
   - sunxi needed to re-add machine specific restart code that was
     removed in anticipation of a watchdog driver being merged for 3.16,
     and it didn't make it in.
   - Marvell fixes for PCIe on SMP and a big-endian fix.
   - A trivial defconfig update to make my capri test board boot with
     bcm_defconfig again.

  ... and a couple of MAINTAINERS updates, one to claim new Keystone
  drivers that have been merged, and one to merge MXS and i.MX (both
  Freescale platforms).

  The largest diffs come from the hwmod code for omap5 and the re-add of
  the restart code on sunxi.  The hwmod stuff is quite late at this
  point but it slipped through cracks repeatedly while coming up the
  maintainer chain and only affects the one SoC so risk is low"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  MAINTAINERS: Add few more Keystone drivers
  MAINTAINERS: merge MXS entry into IMX one
  ARM: sunxi: Reintroduce the restart code for A10/A20 SoCs
  ARM: mvebu: fix cpuidle implementation to work on big-endian systems
  ARM: mvebu: update L2/PCIe deadlock workaround after L2CC cleanup
  ARM: mvebu: move Armada 375 external abort logic as a quirk
  ARM: bcm: Fix bcm and multi_v7 defconfigs
  ARM: dts: dra7-evm: remove interrupt binding
  ARM: OMAP2+: Fix parser-bug in platform muxing code
  ARM: DTS: dra7/dra7xx-clocks: ATL related changes
  ARM: OMAP2+: drop unused function
  ARM: dts: am43x-epos-evm: Add Missing cpsw-phy-sel for am43x-epos-evm
  ARM: dts: omap5: Update CPU OPP table as per final production Manual
  ARM: DRA722: add detection of SoC information
  ARM: dts: Enable twl4030 off-idle configuration for selected omaps
  ARM: OMAP5: hwmod: Add ocp2scp3 and sata hwmods
  ARM: OMAP2+: hwmod: Change hardreset soc_ops for AM43XX

10 years agoMerge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Sat, 5 Jul 2014 23:56:14 +0000 (16:56 -0700)]
Merge branch 'irq-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull irq fixes from Thomas Gleixner:
 "A few minor fixlets in ARM SoC irq drivers and a fix for a memory leak
  which I introduced in the last round of cleanups :("

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  genirq: Fix memory leak when calling irq_free_hwirqs()
  irqchip: spear_shirq: Fix interrupt offset
  irqchip: brcmstb-l2: Level-2 interrupts are edge sensitive
  irqchip: armada-370-xp: Mask all interrupts during initialization.

10 years agoMerge tag 'drm-intel-fixes-2014-07-03' of git://anongit.freedesktop.org/drm-intel
Dave Airlie [Sat, 5 Jul 2014 21:49:59 +0000 (07:49 +1000)]
Merge tag 'drm-intel-fixes-2014-07-03' of git://anongit.freedesktop.org/drm-intel

Fixes for 3.16-rc3; most importantly Jesse brings back VGA he took away
on a bunch of machines. Also a vblank fix for BDW and a power workaround
fix for VLV.

* tag 'drm-intel-fixes-2014-07-03' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: Drop early VLV WA to fix Voltage not getting dropped to Vmin
  drm/i915: only apply crt_present check on VLV
  drm/i915: Wait for vblank after enabling the primary plane on BDW

10 years agoMerge branch 'vmwgfx-fixes-3.16' of git://people.freedesktop.org/~thomash/linux
Dave Airlie [Sat, 5 Jul 2014 21:49:28 +0000 (07:49 +1000)]
Merge branch 'vmwgfx-fixes-3.16' of git://people.freedesktop.org/~thomash/linux

fix to a 3.15 commit.

* 'vmwgfx-fixes-3.16' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Fix incorrect write to read-only register v2:

10 years agoMerge branch 'tda998x-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox
Dave Airlie [Sat, 5 Jul 2014 21:48:26 +0000 (07:48 +1000)]
Merge branch 'tda998x-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox

mode fixes for tda998x.

* 'tda998x-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox:
  drm/i2c: tda998x: add some basic mode validation
  drm/i2c: tda998x: faster polling for edid
  drm/i2c: tda998x: move drm_i2c_encoder_destroy call

10 years agogenirq: Fix memory leak when calling irq_free_hwirqs()
Keith Busch [Mon, 30 Jun 2014 22:24:44 +0000 (16:24 -0600)]
genirq: Fix memory leak when calling irq_free_hwirqs()

irq_free_hwirqs() always calls irq_free_descs() with a cnt == 0
which makes it a no-op since the interrupt count to free is
decremented in itself.

Fixes: 7b6ef1262549f6afc5c881aaef80beb8fd15f908
Signed-off-by: Keith Busch <keith.busch@intel.com>
Acked-by: David Rientjes <rientjes@google.com>
Link: http://lkml.kernel.org/r/1404167084-8070-1-git-send-email-keith.busch@intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
10 years agoMerge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Linus Torvalds [Sat, 5 Jul 2014 17:12:52 +0000 (10:12 -0700)]
Merge tag 'arm64-fixes' of git://git./linux/kernel/git/arm64/linux

Pull ARM64 fixes from Catalin Marinas:
 - Exception level check at boot time (for completeness, not triggering
   any bug before)
 - I/D-cache synchronisation logic for huge pages
 - Config symbol typo

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: fix el2_setup check of CurrentEL
  arm64: mm: Make icache synchronisation logic huge page aware
  arm64: mm: Fix horrendous config typo

10 years agoMAINTAINERS: Add few more Keystone drivers
Santosh Shilimkar [Sun, 22 Jun 2014 20:06:22 +0000 (16:06 -0400)]
MAINTAINERS: Add few more Keystone drivers

Update MAINTAINERS file for recently added reset controller, AEMIF
and clocksource driver for Keystone SOCs.

The EMIF memory controller driver is also added along with AEMIF.

Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Olof Johansson <olof@lixom.net>
Cc: Kevin Hilman <khilman@linaro.org>
Cc: Mike Turquette <mturquette@linaro.org>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Olof Johansson <olof@lixom.net>