]>
git.karo-electronics.de Git - linux-beck.git/log
Jiayi Ye [Mon, 20 Oct 2014 11:13:56 +0000 (19:13 +0800)]
staging: ft1000: ft1000-pcmcia: removed unused variable in ft1000_hw.c
Variable whose value is initialized but never used is unnecessary. The following Coccinelle semantic patch removed the unused variable.
@e@
identifier i;
position p;
type T;
@@
extern T i@p;
@@
type T;
identifier i;
constant C;
position p != e.p;
@@
- T i@p;
<+... when != i
- i = C;
...+>
Signed-off-by: Jiayi Ye <yejiayily@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tapasweni Pathak [Mon, 20 Oct 2014 04:54:49 +0000 (10:24 +0530)]
staging: ft1000: Remove parentheses from return arguments
The sematic patch used for this is:
// <smpl>
@@
identifier i;
constant c;
@@
return
- (
\(i\|-i\|i(...)\|c\)
- )
;
// </smpl>
Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tapasweni Pathak [Tue, 21 Oct 2014 04:18:20 +0000 (09:48 +0530)]
staging: rtl8188eu: os_dep: Replaced kzalloc and memcpy with kmemdup
Replaced calls to kzalloc followed by memcpy with a single call to
kmemdup.
Patch found using coccicheck.
Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tapasweni Pathak [Tue, 21 Oct 2014 04:18:01 +0000 (09:48 +0530)]
staging: rtl8188eu: os_dep: Remove useless cast on kzalloc
Casting rhe return value which is a void pointer is redundant.
The conversion from void pointer to any other pointer type is
guaranteed by the C programming language, as mentioned in
Documentation/CodingStyle, Chap 14.
Removed the cast on kzalloc return value.
Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jiayi Ye [Mon, 20 Oct 2014 06:04:55 +0000 (14:04 +0800)]
staging: rtl8188eu: core: fixed msleep < 20ms can sleep for up to 20ms warning in rtw_efuse.c
This patch fixes following checkpatch.pl warning:
WARNING: msleep < 20ms can sleep for up to 20ms; see Documentation/timers/timers-howto.txt
Signed-off-by: Jiayi Ye <yejiayily@gmail.comi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tina Ruchandani [Wed, 22 Oct 2014 20:39:11 +0000 (13:39 -0700)]
Staging: lustre: llite: Declare ptr args correctly
This patch fixes the following checkpatch errors:
ERROR: "foo * bar" should be "foo *bar"
951: FILE: drivers/staging/lustre/lustre/llite/namei.c:951:
static void ll_get_child_fid(struct inode * dir, struct qstr *name,
1193: FILE: drivers/staging/lustre/lustre/llite/namei.c:1193:
static int ll_unlink(struct inode * dir, struct dentry *dentry)
Signed-off-by: Tina Ruchandani <ruchandani.tina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tina Ruchandani [Wed, 22 Oct 2014 20:21:40 +0000 (13:21 -0700)]
Staging: lustre: libcfs: Fix switch-case indent
This patch fixes the following checkpatch error:j
ERROR: switch and case should be at the same indent
105: FILE: drivers/staging/lustre/lustre/libcfs/fail.c:105:
Signed-off-by: Tina Ruchandani <ruchandani.tina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tina Ruchandani [Wed, 22 Oct 2014 19:28:49 +0000 (12:28 -0700)]
Staging: lustre: llite: Use () around long macro
This patch fixes the following checkpatch.pl
error: "Macros with complex values should be enclosed
in parentheses."
Signed-off-by: Tina Ruchandani <ruchandani.tina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tina Ruchandani [Wed, 22 Oct 2014 19:16:04 +0000 (12:16 -0700)]
Staging: lustre: llite: Remove C99 '//' comments
This patch fixes the following checkpatch.pl errors:
ERROR: do not use C99 // comments
538: FILE: drivers/staging/lustre/lustre/llite/rw26.c:538:
// .orig_aops.readpages = ll_readpages,
816: FILE: drivers/staging/lustre/lustre/llite/lproc_llite.c:816:
//{ "mntpt_path", ll_rd_path, 0, 0 },
826: FILE: drivers/staging/lustre/lustre/llite/lproc_llite.c:826:
//{ "filegroups", lprocfs_rd_filegroups, 0, 0 },
Signed-off-by: Tina Ruchandani <ruchandani.tina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tina Ruchandani [Wed, 22 Oct 2014 18:29:26 +0000 (11:29 -0700)]
staging: lustre: llite: Use kcalloc not kzalloc with mult
This patch fixes the following checkpatch.pl warnings:
WARNING: Prefer kcalloc over kzalloc with multiply
166: FILE: drivers/staging/lustre/lustre/llite/dir.c:166:
page_pool = kzalloc(sizeof(page) * max_pages, GFP_NOFS);
796: FILE: drivers/staging/lustre/lustre/llite/lloop.c:796:
loop_dev = kzalloc(max_loop * sizeof(*loop_dev), GFP_KERNEL);
800: FILE: drivers/staging/lustre/lustre/llite/lloop.c:800:
disks = kzalloc(max_loop * sizeof(*disks), GFP_KERNEL);
Signed-off-by: Tina Ruchandani <ruchandani.tina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tina Ruchandani [Wed, 22 Oct 2014 05:13:21 +0000 (22:13 -0700)]
staging: lustre: Fix checkpatch.pl spacing-related errors
This patch fixes misc. spacing errors reported by
checkpatch.pl for lustre/llite/file.c
Signed-off-by: Tina Ruchandani <ruchandani.tina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jiayi Ye [Mon, 20 Oct 2014 11:52:03 +0000 (19:52 +0800)]
staging: lustre: lustre: obdecho: expand the GOTO macro in echo_client.c
The GOTO macro is not standard in Linux. The following Coccinelle semantic patch was used to expand the GOTO macro.
@@
identifier lbl;
identifier rc;
constant c;
@@
- GOTO(lbl,\(rc\|c\));
+ goto lbl;
@@
identifier lbl;
expression rc;
@@
- GOTO(lbl,rc);
+ rc;
+ goto lbl;
Signed-off-by: Jiayi Ye <yejiayily@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Vaishali Thakkar [Mon, 20 Oct 2014 08:28:35 +0000 (13:58 +0530)]
Staging: lustre: Remove typedef ldlm_ns_hash_def_t
The linux kernel coding style guidelines suggest not using typedefs
for structure types. This patch gets rid of the typedef for
ldlm_ns_hash_def_t. Also, the name of the struct is changed to drop
the _t, to make the name look less typedef-like.
This is done using Coccinelle. Semantic patch used to detect this
case is as follows:
@tn1@
type td;
@@
typedef struct { ... } td;
@script:python tf@
td << tn1.td;
tdres;
@@
coccinelle.tdres = td;
@@
type tn1.td;
identifier tf.tdres;
@@
-typedef
struct
+ tdres
{ ... }
-td
;
@@
type tn1.td;
identifier tf.tdres;
@@
-td
+ struct tdres
Signed-off-by: Vaishali Thakkar <vthakkar1994@gmail.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Vaishali Thakkar [Mon, 20 Oct 2014 05:10:22 +0000 (10:40 +0530)]
Staging: lustre: lnet: Make functions static
This patch makes functions proc_lnet_routes, proc_lnet_routers,
proc_lnet_peers and proc_lnet_nis static in file router_proc.c
as they are used only in this file.
This problem is detected by sparse.
Signed-off-by: Vaishali Thakkar <vthakkar1994@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Roberta Dobrescu [Wed, 22 Oct 2014 13:50:17 +0000 (16:50 +0300)]
staging: iio: iio_event_monitor: Add support for missing IIO modifiers
This patch adds the missing IIO modifiers in event_is_known function
and iio_modifier_names vector.
Additionally, it removes duplicate name entries of IIO_MOD_LIGHT_BOTH
and IIO_MOD_LIGHT_IR in iio_modifier_names.
Signed-off-by: Roberta Dobrescu <roberta.dobrescu@gmail.com>
Reviewed-by: Daniel Baluta <daniel.baluta@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Somya Anand [Wed, 22 Oct 2014 11:54:03 +0000 (17:24 +0530)]
Staging: dgnc: Remove unused sniff code
The output written by dgnc_sniff_nowait_nolock() is never used
anywhere since commit
35cf90459312f ("staging: dgnc: removes proc code")
deleted the code that used to copy it to user space.
dgnc_sniff_nowait_nolock() uses 'timeval' to create header timestamps for
the data dump.
32-bit systems using 'struct timeval' will break in the year 2038,
This patch removes dgnc_sniff_nowait_nolock() and all ch_sniff_* members
of struct channel_t defined in "dgnc_driver.h". It also removes their usage
from the driver files and hence y2038 issue is also resolved.
Signed-off-by: Somya Anand <somyaanand214@gmail.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Aya Mahfouz [Wed, 22 Oct 2014 13:30:40 +0000 (15:30 +0200)]
staging: vt6655: wcmd.c: fix print priority warning
This patch fixes the following warning generated by checkpatch.pl
for the file wcmd.c
WARNING: printk() should include KERN_ facility level
printk was replaced by netdev_err since providing printk with the
facility level KERN_ERR generated the printing priority warning.
Signed-off-by: Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Eric Rost [Wed, 1 Oct 2014 03:23:23 +0000 (22:23 -0500)]
staging: skein: File Reorg
Reorganizes file to remove #defines from middle of functions. Also
removes #if'd loop declarations and adds ternary if driven loops.
Signed-off-by: Eric Rost <eric.rost@mybabylon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Eric Rost [Wed, 1 Oct 2014 03:22:47 +0000 (22:22 -0500)]
staging: skein: Whitespace cleanup
Pretties up multiline #defines and many other whitespace issues
Signed-off-by: Eric Rost <eric.rost@mybabylon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Greg Kroah-Hartman [Thu, 16 Oct 2014 13:26:51 +0000 (15:26 +0200)]
android: binder: remove binder.h
binder.h isn't needed to just include a uapi file and set a single
define, so move it into binder.c to save a few lines of code.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Greg Kroah-Hartman [Thu, 16 Oct 2014 13:22:30 +0000 (15:22 +0200)]
android: uapi: binder.h
add types.h to .h file to pass the checker scripts, and provide a proper
uapi .h file.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Greg Kroah-Hartman [Thu, 16 Oct 2014 12:40:38 +0000 (14:40 +0200)]
staging: android: binder: move to the "real" part of the kernel
The Android binder code has been "stable" for many years now. No matter
what comes in the future, we are going to have to support this API, so
might as well move it to the "real" part of the kernel as there's no
real work that needs to be done to the existing code.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jeff Kirsher [Wed, 15 Oct 2014 22:53:27 +0000 (15:53 -0700)]
staging: bcm: remove driver
The Beceem WiMAX driver was barely function in its current state
and was non-functional on 64 bit systems. Based on repeated
statements from Greg KH that he wanted the driver removed, I am
removing the driver.
CC: Matthias Beyer <mail@beyermatthias.de>
CC: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Aya Mahfouz [Sat, 11 Oct 2014 00:42:45 +0000 (02:42 +0200)]
staging: vt6655: replace memcpy() by ether_addr_copy() using coccinelle and pack variables
This patch focuses on fixing the following warning generated
by checkpatch.pl for the file rxtx.c :
Prefer ether_addr_copy() over memcpy() if the Ethernet addresses
are __aligned(2)
The changes were applied using the following coccinelle rule:
@@ expression e1, e2; @@
- memcpy(e1, e2, ETH_ALEN);
+ ether_addr_copy(e1, e2);
After applying the rule, some referencing operations were
adjusted manually to avoid a gcc compilation warning.
According to ether_addr_copy() description and functionality,
all Ethernet addresses should align to the u16 datatype.
A check was made on the following datastructures:
- vnt_mic_hdr
- tagS802_11Header
- tagSEthernetHeader
- vnt_rts_g
- ieee80211_rts
- vnt_private
To maintain that the array abyCurrentNetAddr in vnt_private is aligned,
it was placed before the boolean bLinkPass in the struct definition.
The definition can be found in device.h. A couple of variables were
packed in holes detected by pahole.
Output of pahole when running it on rxtx.o after the changes:
truct tagSEthernetHeader {
unsigned char abyDstAddr[6]; /* 0 6 */
unsigned char abySrcAddr[6]; /* 6 6 */
short unsigned int wType; /* 12 2 */
/* size: 14, cachelines: 1, members: 3 */
/* last cacheline: 14 bytes */
};
struct tagS802_11Header {
short unsigned int wFrameCtl; /* 0 2 */
short unsigned int wDurationID; /* 2 2 */
unsigned char abyAddr1[6]; /* 4 6 */
unsigned char abyAddr2[6]; /* 10 6 */
unsigned char abyAddr3[6]; /* 16 6 */
short unsigned int wSeqCtl; /* 22 2 */
unsigned char abyAddr4[6]; /* 24 6 */
/* size: 30, cachelines: 1, members: 7 */
/* last cacheline: 30 bytes */
};
struct ieee80211_rts {
__le16 frame_control; /* 0 2 */
__le16 duration; /* 2 2 */
u8 ra[6]; /* 4 6 */
u8 ta[6]; /* 10 6 */
/* size: 16, cachelines: 1, members: 4 */
/* last cacheline: 16 bytes */
};
struct vnt_private {
struct pci_dev * pcid; /* 0 4 */
struct net_device * dev; /* 4 4 */
dma_addr_t pool_dma; /* 8 4 */
dma_addr_t rd0_pool_dma; /* 12 4 */
dma_addr_t rd1_pool_dma; /* 16 4 */
dma_addr_t td0_pool_dma; /* 20 4 */
dma_addr_t td1_pool_dma; /* 24 4 */
dma_addr_t tx_bufs_dma0; /* 28 4 */
dma_addr_t tx_bufs_dma1; /* 32 4 */
dma_addr_t tx_beacon_dma; /* 36 4 */
unsigned char * tx0_bufs; /* 40 4 */
unsigned char * tx1_bufs; /* 44 4 */
unsigned char * tx_beacon_bufs; /* 48 4 */
CHIP_TYPE chip_id; /* 52 4 */
void * PortOffset; /* 56 4 */
long unsigned int dwIsr; /* 60 4 */
/*--- cacheline 1 boundary (64 bytes) ---*/
u32 memaddr; /* 64 4 */
u32 ioaddr; /* 68 4 */
u32 io_size; /* 72 4 */
unsigned char byRevId; /* 76 1 */
unsigned char byRxMode; /* 77 1 */
short unsigned int SubSystemID; /* 78 2 */
short unsigned int SubVendorID; /* 80 2 */
spinlock_t lock; /* 82 2 */
int nTxQueues; /* 84 4 */
volatile int iTDUsed; /* 88 8 */
volatile PSTxDesc apCurrTD; /* 96 8 */
volatile PSTxDesc apTailTD; /* 104 8 */
volatile PSTxDesc apTD0Rings; /* 112 4 */
volatile PSTxDesc apTD1Rings; /* 116 4 */
volatile PSRxDesc aRD0Ring; /* 120 4 */
volatile PSRxDesc aRD1Ring; /* 124 4 */
/*--- cacheline 2 boundary (128 bytes) ---*/
volatile PSRxDesc pCurrRD; /* 128 8 */
SCache sDupRxCache; /* 136 44 */
SDeFragControlBlock sRxDFCB[64]; /* 180 2048 */
/*--- cacheline 34 boundary (2176 bytes) was 52 bytes ago ---*/
unsigned int cbDFCB; /* 2228 4 */
unsigned int cbFreeDFCB; /* 2232 4 */
unsigned int uCurrentDFCBIdx; /* 2236 4 */
/*--- cacheline 35 boundary (2240 bytes) ---*/
OPTIONS sOpts; /* 2240 52 */
u32 flags; /* 2292 4 */
u32 rx_buf_sz; /* 2296 4 */
int multicast_limit; /* 2300 4 */
/*--- cacheline 36 boundary (2304 bytes) ---*/
pid_t MLMEThr_pid; /* 2304 4 */
struct completion notify; /* 2308 16 */
struct semaphore mlme_semaphore; /* 2324 16 */
u32 rx_bytes; /* 2340 4 */
unsigned char byLocalID; /* 2344 1 */
unsigned char byRFType; /* 2345 1 */
unsigned char byMaxPwrLevel; /* 2346 1 */
unsigned char byZoneType; /* 2347 1 */
bool bZoneRegExist; /* 2348 1 */
unsigned char byOriginalZonetype; /* 2349 1 */
unsigned char abyMacContext[384]; /* 2350 384 */
/*--- cacheline 42 boundary (2688 bytes) was 46 bytes ago ---*/
unsigned char abyCurrentNetAddr[6]; /* 2734 6 */
bool bLinkPass; /* 2740 1 */
/* XXX 3 bytes hole, try to pack */
SStatCounter scStatistic; /* 2744 776 */
/*--- cacheline 55 boundary (3520 bytes) ---*/
SDot11Counters s802_11Counter; /* 3520 172 */
/*--- cacheline 57 boundary (3648 bytes) was 44 bytes ago ---*/
PSMgmtObject pMgmt; /* 3692 4 */
SMgmtObject sMgmtObj; /* 3696 95840 */
/*--- cacheline 1555 boundary (99520 bytes) was 16 bytes ago ---*/
/* Bitfield combined with previous fields */
unsigned int uCurrRSSI; /* 0 4 */
unsigned char byCurrSQ; /* 0 1 */
long unsigned int dwTxAntennaSel; /* 0 4 */
long unsigned int dwRxAntennaSel; /* 0 4 */
unsigned char byAntennaCount; /* 0 1 */
unsigned char byRxAntennaMode; /* 0 1 */
unsigned char byTxAntennaMode; /* 0 1 */
bool bTxRxAntInv; /* 0 1 */
unsigned char * pbyTmpBuff; /* 0 4 */
unsigned int uSIFS; /* 0 4 */
unsigned int uDIFS; /* 0 4 */
unsigned int uEIFS; /* 0 4 */
unsigned int uSlot; /* 0 4 */
unsigned int uCwMin; /* 0 4 */
unsigned int uCwMax; /* 0 4 */
unsigned char bySIFS; /* 0 1 */
unsigned char byDIFS; /* 0 1 */
unsigned char byEIFS; /* 0 1 */
unsigned char bySlot; /* 0 1 */
unsigned char byCWMaxMin; /* 0 1 */
CARD_PHY_TYPE eCurrentPHYType; /* 0 4 */
VIA_BB_TYPE byBBType; /* 0 4 */
VIA_PKT_TYPE byPacketType; /* 0 4 */
short unsigned int wBasicRate; /* 0 2 */
unsigned char byACKRate; /* 0 1 */
unsigned char byTopOFDMBasicRate; /* 0 1 */
unsigned char byTopCCKBasicRate; /* 0 1 */
unsigned char byMinChannel; /* 0 1 */
unsigned char byMaxChannel; /* 0 1 */
unsigned int uConnectionRate; /* 0 4 */
unsigned char byPreambleType; /* 0 1 */
unsigned char byShortPreamble; /* 0 1 */
short unsigned int wCurrentRate; /* 0 2 */
short unsigned int wRTSThreshold; /* 0 2 */
short unsigned int wFragmentationThreshold; /* 0 2 */
unsigned char byShortRetryLimit; /* 0 1 */
unsigned char byLongRetryLimit; /* 0 1 */
enum nl80211_iftype op_mode; /* 0 4 */
unsigned char byOpMode; /* 0 1 */
bool bBSSIDFilter; /* 0 1 */
short unsigned int wMaxTransmitMSDULifetime; /* 0 2 */
unsigned char abyBSSID[6]; /* 0 6 */
unsigned char abyDesireBSSID[6]; /* 0 6 */
short unsigned int wACKDuration; /* 0 2 */
short unsigned int wRTSTransmitLen; /* 0 2 */
unsigned char byRTSServiceField; /* 0 1 */
unsigned char byRTSSignalField; /* 0 1 */
long unsigned int dwMaxReceiveLifetime; /* 0 4 */
bool bEncryptionEnable; /* 0 1 */
bool bLongHeader; /* 0 1 */
bool bShortSlotTime; /* 0 1 */
bool bProtectMode; /* 0 1 */
bool bNonERPPresent; /* 0 1 */
bool bBarkerPreambleMd; /* 0 1 */
unsigned char byERPFlag; /* 0 1 */
short unsigned int wUseProtectCntDown; /* 0 2 */
bool bRadioControlOff; /* 0 1 */
bool bRadioOff; /* 0 1 */
bool bEnablePSMode; /* 0 1 */
short unsigned int wListenInterval; /* 0 2 */
bool bPWBitOn; /* 0 1 */
WMAC_POWER_MODE ePSMode; /* 0 4 */
unsigned char byRadioCtl; /* 0 1 */
unsigned char byGPIO; /* 0 1 */
bool bHWRadioOff; /* 0 1 */
bool bPrvActive4RadioOFF; /* 0 1 */
bool bGPIOBlockRead; /* 0 1 */
short unsigned int wSeqCounter; /* 0 2 */
short unsigned int wBCNBufLen; /* 0 2 */
bool bBeaconBufReady; /* 0 1 */
bool bBeaconSent; /* 0 1 */
bool bIsBeaconBufReadySet; /* 0 1 */
unsigned int cbBeaconBufReadySetCnt; /* 0 4 */
bool bFixRate; /* 0 1 */
unsigned char byCurrentCh; /* 0 1 */
unsigned int uScanTime; /* 0 4 */
CMD_STATE eCommandState; /* 0 4 */
CMD_CODE eCommand; /* 0 4 */
bool bBeaconTx; /* 0 1 */
bool bStopBeacon; /* 0 1 */
bool bStopDataPkt; /* 0 1 */
bool bStopTx0Pkt; /* 0 1 */
unsigned int uAutoReConnectTime; /* 0 4 */
CMD_ITEM eCmdQueue[32]; /* 0 1408 */
unsigned int uCmdDequeueIdx; /* 0 4 */
unsigned int uCmdEnqueueIdx; /* 0 4 */
unsigned int cbFreeCmdQueue; /* 0 4 */
bool bCmdRunning; /* 0 1 */
bool bCmdClear; /* 0 1 */
bool bRoaming; /* 0 1 */
unsigned char abyIPAddr[4]; /* 0 4 */
long unsigned int ulTxPower; /* 0 4 */
NDIS_802_11_WEP_STATUS eEncryptionStatus; /* 0 4 */
bool bTransmitKey; /* 0 1 */
NDIS_802_11_WEP_STATUS eOldEncryptionStatus; /* 0 4 */
SKeyManagement sKey; /* 0 3784 */
long unsigned int dwIVCounter; /* 0 4 */
u64 qwPacketNumber; /* 0 8 */
unsigned int uCurrentWEPMode; /* 0 4 */
RC4Ext SBox; /* 0 264 */
unsigned char abyPRNG[35]; /* 0 35 */
unsigned char byKeyIndex; /* 0 1 */
unsigned int uKeyLength; /* 0 4 */
unsigned char abyKey[29]; /* 0 29 */
bool bAES; /* 0 1 */
unsigned char byCntMeasure; /* 0 1 */
unsigned int uAssocCount; /* 0 4 */
bool bMoreData; /* 0 1 */
bool bGrpAckPolicy; /* 0 1 */
bool bAssocInfoSet; /* 0 1 */
unsigned char byAutoFBCtrl; /* 0 1 */
bool bTxMICFail; /* 0 1 */
bool bRxMICFail; /* 0 1 */
unsigned int uRATEIdx; /* 0 4 */
bool bUpdateBBVGA; /* 0 1 */
unsigned int uBBVGADiffCount; /* 0 4 */
unsigned char byBBVGANew; /* 0 1 */
unsigned char byBBVGACurrent; /* 0 1 */
unsigned char abyBBVGA[4]; /* 0 4 */
long int ldBmThreshold[4]; /* 0 16 */
unsigned char byBBPreEDRSSI; /* 0 1 */
unsigned char byBBPreEDIndex; /* 0 1 */
bool bRadioCmd; /* 0 1 */
long unsigned int dwDiagRefCount; /* 0 4 */
unsigned char byFOETuning; /* 0 1 */
unsigned char byAutoPwrTunning; /* 0 1 */
short int sPSetPointCCK; /* 0 2 */
short int sPSetPointOFDMG; /* 0 2 */
short int sPSetPointOFDMA; /* 0 2 */
long int lPFormulaOffset; /* 0 4 */
short int sPThreshold; /* 0 2 */
char cAdjustStep; /* 0 1 */
char cMinTxAGC; /* 0 1 */
unsigned char byCCKPwr; /* 0 1 */
unsigned char byOFDMPwrG; /* 0 1 */
unsigned char byCurPwr; /* 0 1 */
char byCurPwrdBm; /* 0 1 */
unsigned char abyCCKPwrTbl[15]; /* 0 15 */
unsigned char abyOFDMPwrTbl[57]; /* 0 57 */
char abyCCKDefaultPwr[15]; /* 0 15 */
char abyOFDMDefaultPwr[57]; /* 0 57 */
char abyRegPwr[57]; /* 0 57 */
char abyLocalPwr[57]; /* 0 57 */
unsigned char byBBCR4d; /* 0 1 */
unsigned char byBBCRc9; /* 0 1 */
unsigned char byBBCR88; /* 0 1 */
unsigned char byBBCR09; /* 0 1 */
struct timer_list sTimerCommand; /* 0 52 */
struct timer_list sTimerTxData; /* 0 52 */
long unsigned int nTxDataTimeCout; /* 0 4 */
bool fTxDataInSleep; /* 0 1 */
bool IsTxDataTrigger; /* 0 1 */
bool fWPA_Authened; /* 0 1 */
unsigned char byReAssocCount; /* 0 1 */
unsigned char byLinkWaitCount; /* 0 1 */
unsigned char abyNodeName[17]; /* 0 17 */
bool bDiversityRegCtlON; /* 0 1 */
bool bDiversityEnable; /* 0 1 */
long unsigned int ulDiversityNValue; /* 0 4 */
long unsigned int ulDiversityMValue; /* 0 4 */
unsigned char byTMax; /* 0 1 */
unsigned char byTMax2; /* 0 1 */
unsigned char byTMax3; /* 0 1 */
long unsigned int ulSQ3TH; /* 0 4 */
long unsigned int uDiversityCnt; /* 0 4 */
unsigned char byAntennaState; /* 0 1 */
long unsigned int ulRatio_State0; /* 0 4 */
long unsigned int ulRatio_State1; /* 0 4 */
struct timer_list TimerSQ3Tmax1; /* 0 52 */
struct timer_list TimerSQ3Tmax2; /* 0 52 */
struct timer_list TimerSQ3Tmax3; /* 0 52 */
long unsigned int uNumSQ3[12]; /* 0 48 */
short unsigned int wAntDiversityMaxRate; /* 0 2 */
SEthernetHeader sTxEthHeader; /* 0 14 */
SEthernetHeader sRxEthHeader; /* 0 14 */
unsigned char abyBroadcastAddr[6]; /* 0 6 */
unsigned char abySNAP_RFC1042[6]; /* 0 6 */
unsigned char abySNAP_Bridgetunnel[6]; /* 0 6 */
unsigned char abyEEPROM[256]; /* 0 256 */
SPMKID gsPMKID; /* 0 360 */
SPMKIDCandidateEvent gsPMKIDCandidate; /* 0 72 */
bool b11hEnable; /* 0 1 */
unsigned char abyCountryCode[3]; /* 0 3 */
unsigned int uNumOfMeasureEIDs; /* 0 4 */
PWLAN_IE_MEASURE_REQ pCurrMeasureEID; /* 0 4 */
bool bMeasureInProgress; /* 0 1 */
unsigned char byOrgChannel; /* 0 1 */
unsigned char byOrgRCR; /* 0 1 */
long unsigned int dwOrgMAR0; /* 0 4 */
long unsigned int dwOrgMAR4; /* 0 4 */
unsigned char byBasicMap; /* 0 1 */
unsigned char byCCAFraction; /* 0 1 */
unsigned char abyRPIs[8]; /* 0 8 */
long unsigned int dwRPIs[8]; /* 0 32 */
bool bChannelSwitch; /* 0 1 */
unsigned char byNewChannel; /* 0 1 */
unsigned char byChannelSwitchCount; /* 0 1 */
bool bQuietEnable; /* 0 1 */
bool bEnableFirstQuiet; /* 0 1 */
unsigned char byQuietStartCount; /* 0 1 */
unsigned int uQuietEnqueue; /* 0 4 */
long unsigned int dwCurrentQuietEndTime; /* 0 4 */
SQuietControl sQuiet[8]; /* 0 96 */
bool bCountryInfo5G; /* 0 1 */
bool bCountryInfo24G; /* 0 1 */
short unsigned int wBeaconInterval; /* 0 2 */
struct net_device * wpadev; /* 0 4 */
bool bWPADEVUp; /* 0 1 */
struct sk_buff * skb; /* 0 4 */
unsigned int bwextcount; /* 0 4 */
bool bWPASuppWextEnabled; /* 0 1 */
bool bEnableHostapd; /* 0 1 */
bool bEnable8021x; /* 0 1 */
bool bEnableHostWEP; /* 0 1 */
struct net_device * apdev; /* 0 4 */
int (*tx_80211)(struct sk_buff *,
struct net_device *); /* 0 4 */
unsigned int uChannel; /* 0 4 */
bool bMACSuspend; /* 0 1 */
struct iw_statistics wstats; /* 0 32 */
bool bCommit; /* 0 1 */
/*--- cacheline 1672 boundary (107008 bytes) ---*/
/* size: 107008, cachelines: 1672, members: 279 */
/* sum members: 107005, holes: 1, sum holes: 3 */
/* padding: 41471 */
/* BRAIN FART ALERT! 107008 != 107005 + 3(holes), diff = 0 */
};
struct vnt_mic_hdr {
u8 id; /* 0 1 */
u8 tx_priority; /* 1 1 */
u8 mic_addr2[6]; /* 2 6 */
u8 ccmp_pn[6]; /* 8 6 */
__be16 payload_len; /* 14 2 */
__be16 hlen; /* 16 2 */
__le16 frame_control; /* 18 2 */
u8 addr1[6]; /* 20 6 */
u8 addr2[6]; /* 26 6 */
u8 addr3[6]; /* 32 6 */
__le16 seq_ctrl; /* 38 2 */
u8 addr4[6]; /* 40 6 */
u16 packing; /* 46 2 */
/* size: 48, cachelines: 1, members: 13 */
/* last cacheline: 48 bytes */
};
struct vnt_rts_g {
struct vnt_phy_field b; /* 0 4 */
struct vnt_phy_field a; /* 4 4 */
__le16 duration_ba; /* 8 2 */
__le16 duration_aa; /* 10 2 */
__le16 duration_bb; /* 12 2 */
u16 reserved; /* 14 2 */
struct ieee80211_rts data; /* 16 16 */
/* size: 32, cachelines: 1, members: 7 */
/* last cacheline: 32 bytes */
};
Signed-off-by: Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Aya Mahfouz [Sat, 11 Oct 2014 00:37:21 +0000 (02:37 +0200)]
staging: vt6655: wmgr.c and wmgr.h: replace memcpy() by ether_addr_copy() using coccinelle and pack variable
This patch focuses on fixing the following warning generated
by checkpatch.pl for the file wmgr.c :
Prefer ether_addr_copy() over memcpy() if the Ethernet addresses
are __aligned(2)
The changes were applied using the following coccinelle rule:
@@ expression e1, e2; @@
- memcpy(e1, e2, ETH_ALEN);
+ ether_addr_copy(e1, e2);
According to ether_addr_copy() description and functionality,
all Ethernet addresses should align to the u16 datatype.
To maintain that the array abyCurrBSSID in tagSMgmtObject is aligned,
it was placed after the int uCurrChannel in the struct definition.
This was done in wmgr.h
Here is the output of pahole for the relevant datastructures:
struct sockaddr {
sa_family_t sa_family; /* 0 2 */
char sa_data[14]; /* 2 14 */
/* size: 16, cachelines: 1, members: 2 */
/* last cacheline: 16 bytes */
};
struct tagSMgmtObject {
void * pAdapter; /* 0 4 */
unsigned char abyMACAddr[6]; /* 4 6 */
/* XXX 2 bytes hole, try to pack */
WMAC_CONFIG_MODE eConfigMode; /* 12 4 */
CARD_PHY_TYPE eCurrentPHYMode; /* 16 4 */
CARD_PHY_TYPE eConfigPHYMode; /* 20 4 */
WMAC_CURRENT_MODE eCurrMode; /* 24 4 */
WMAC_BSS_STATE eCurrState; /* 28 4 */
PKnownBSS pCurrBSS; /* 32 4 */
unsigned char byCSSGK; /* 36 1 */
unsigned char byCSSPK; /* 37 1 */
/* XXX 2 bytes hole, try to pack */
unsigned int uCurrChannel; /* 40 4 */
unsigned char abyCurrBSSID[6]; /* 44 6 */
unsigned char abyCurrSuppRates[19]; /* 50 19 */
/* --- cacheline 1 boundary (64 bytes) was 5 bytes ago --- */
unsigned char abyCurrExtSuppRates[19]; /* 69 19 */
unsigned char abyCurrSSID[35]; /* 88 35 */
/* XXX 1 byte hole, try to pack */
short unsigned int wCurrCapInfo; /* 124 2 */
short unsigned int wCurrAID; /* 126 2 */
/* --- cacheline 2 boundary (128 bytes) --- */
short unsigned int wCurrATIMWindow; /* 128 2 */
short unsigned int wCurrBeaconPeriod; /* 130 2 */
bool bIsDS; /* 132 1 */
unsigned char byERPContext; /* 133 1 */
/* XXX 2 bytes hole, try to pack */
CMD_STATE eCommandState; /* 136 4 */
unsigned int uScanChannel; /* 140 4 */
unsigned char abyDesireSSID[35]; /* 144 35 */
unsigned char abyDesireBSSID[6]; /* 179 6 */
/* XXX 1 byte hole, try to pack */
short unsigned int wIBSSBeaconPeriod; /* 186 2 */
short unsigned int wIBSSATIMWindow; /* 188 2 */
/* XXX 2 bytes hole, try to pack */
/* --- cacheline 3 boundary (192 bytes) --- */
unsigned int uIBSSChannel; /* 192 4 */
unsigned char abyIBSSSuppRates[19]; /* 196 19 */
unsigned char byAPBBType; /* 215 1 */
unsigned char abyWPAIE[64]; /* 216 64 */
/* --- cacheline 4 boundary (256 bytes) was 24 bytes ago --- */
short unsigned int wWPAIELen; /* 280 2 */
/* XXX 2 bytes hole, try to pack */
unsigned int uAssocCount; /* 284 4 */
bool bMoreData; /* 288 1 */
/* XXX 3 bytes hole, try to pack */
WMAC_SCAN_STATE eScanState; /* 292 4 */
WMAC_SCAN_TYPE eScanType; /* 296 4 */
unsigned int uScanStartCh; /* 300 4 */
unsigned int uScanEndCh; /* 304 4 */
short unsigned int wScanSteps; /* 308 2 */
/* XXX 2 bytes hole, try to pack */
unsigned int uScanBSSType; /* 312 4 */
unsigned char abyScanSSID[35]; /* 316 35 */
/* --- cacheline 5 boundary (320 bytes) was 31 bytes ago --- */
unsigned char abyScanBSSID[6]; /* 351 6 */
/* XXX 3 bytes hole, try to pack */
WMAC_AUTHENTICATION_MODE eAuthenMode; /* 360 4 */
WMAC_ENCRYPTION_MODE eEncryptionMode; /* 364 4 */
bool bShareKeyAlgorithm; /* 368 1 */
unsigned char abyChallenge[128]; /* 369 128 */
/* --- cacheline 7 boundary (448 bytes) was 49 bytes ago --- */
bool bPrivacyInvoked; /* 497 1 */
bool bInTIM; /* 498 1 */
bool bMulticastTIM; /* 499 1 */
unsigned char byDTIMCount; /* 500 1 */
unsigned char byDTIMPeriod; /* 501 1 */
/* XXX 2 bytes hole, try to pack */
WMAC_POWER_MODE ePSMode; /* 504 4 */
short unsigned int wListenInterval; /* 508 2 */
short unsigned int wCountToWakeUp; /* 510 2 */
/* --- cacheline 8 boundary (512 bytes) --- */
bool bInTIMWake; /* 512 1 */
/* XXX 3 bytes hole, try to pack */
unsigned char * pbyPSPacketPool; /* 516 4 */
unsigned char byPSPacketPool[36]; /* 520 36 */
bool bRxBeaconInTBTTWake; /* 556 1 */
unsigned char abyPSTxMap[65]; /* 557 65 */
/* XXX 2 bytes hole, try to pack */
/* --- cacheline 9 boundary (576 bytes) was 48 bytes ago --- */
unsigned int uCmdBusy; /* 624 4 */
unsigned int uCmdHostAPBusy; /* 628 4 */
unsigned char * pbyMgmtPacketPool; /* 632 4 */
unsigned char byMgmtPacketPool[2352]; /* 636 2352 */
/* --- cacheline 46 boundary (2944 bytes) was 44 bytes ago --- */
struct timer_list sTimerSecondCallback; /* 2988 52 */
/* --- cacheline 47 boundary (3008 bytes) was 32 bytes ago --- */
SRxMgmtPacket sRxPacket; /* 3040 28 */
KnownBSS sBSSList[42]; /* 3068 57288 */
/* --- cacheline 943 boundary (60352 bytes) was 4 bytes ago --- */
KnownNodeDB sNodeDBTable[65]; /* 60356 20800 */
/* --- cacheline 1268 boundary (81152 bytes) was 4 bytes ago --- */
/* Bitfield combined with previous fields */
SPMKIDCache gsPMKIDCache; /* 0 356 */
bool bRoaming; /* 0 1 */
SAssocInfo sAssocInfo; /* 0 7064 */
bool b11hEnable; /* 0 1 */
bool bSwitchChannel; /* 0 1 */
unsigned char byNewChannel; /* 0 1 */
PWLAN_IE_MEASURE_REP pCurrMeasureEIDRep; /* 0 4 */
unsigned int uLengthOfRepEIDs; /* 0 4 */
unsigned char abyCurrentMSRReq[2352]; /* 0 2352 */
unsigned char abyCurrentMSRRep[2352]; /* 0 2352 */
unsigned char abyIECountry[2340]; /* 0 2340 */
unsigned char abyIBSSDFSOwner[6]; /* 0 6 */
unsigned char byIBSSDFSRecovery; /* 0 1 */
struct sk_buff skb; /* 0 192 */
/* XXX last struct has 4 bytes of padding */
/* --- cacheline 1497 boundary (95808 bytes) was 32 bytes ago --- */
/* size: 95840, cachelines: 1498, members: 81 */
/* sum members: 95813, holes: 13, sum holes: 27 */
/* padding: 30112 */
/* paddings: 1, sum paddings: 4 */
/* last cacheline: 32 bytes */
/* BRAIN FART ALERT! 95840 != 95813 + 27(holes), diff = 0 */
};
struct pmkid_candidate {
NDIS_802_11_MAC_ADDRESS BSSID; /* 0 6 */
/* XXX 2 bytes hole, try to pack */
long unsigned int Flags; /* 8 4 */
/* size: 12, cachelines: 1, members: 2 */
/* sum members: 10, holes: 1, sum holes: 2 */
/* last cacheline: 12 bytes */
};
Signed-off-by: Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Aya Mahfouz [Sat, 11 Oct 2014 00:34:07 +0000 (02:34 +0200)]
staging: vt6655: dpc.c: replace memcpy() by ether_addr_copy() using coccinelle
This patch focuses on fixing the following warning generated
by checkpatch.pl for the file dpc.c :
Prefer ether_addr_copy() over memcpy() if the Ethernet addresses
are __aligned(2)
The changes were applied using the following coccinelle rule:
@@ expression e1, e2; @@
- memcpy(e1, e2, ETH_ALEN);
+ ether_addr_copy(e1, e2);
According to ether_addr_copy() description and functionality,
all Ethernet addresses should align to the u16 datatype.
Here is the output of pahole for the relevant datastructures:
struct tagS802_11Header {
short unsigned int wFrameCtl; /* 0 2 */
short unsigned int wDurationID; /* 2 2 */
unsigned char abyAddr1[6]; /* 4 6 */
unsigned char abyAddr2[6]; /* 10 6 */
unsigned char abyAddr3[6]; /* 16 6 */
short unsigned int wSeqCtl; /* 22 2 */
unsigned char abyAddr4[6]; /* 24 6 */
/* size: 30, cachelines: 1, members: 7 */
/* last cacheline: 30 bytes */
};
struct iw_michaelmicfailure {
__u32 flags; /* 0 4 */
struct sockaddr src_addr; /* 4 16 */
__u8 tsc[8]; /* 20 8 */
/* size: 28, cachelines: 1, members: 3 */
/* last cacheline: 28 bytes */
};
struct sockaddr {
sa_family_t sa_family; /* 0 2 */
char sa_data[14]; /* 2 14 */
/* size: 16, cachelines: 1, members: 2 */
/* last cacheline: 16 bytes */
};
There is one thing to note though, sa_data is a char array of size 14.
And the number of bytes copied using memcpy() or ether_addr_copy()
is 6.
Signed-off-by: Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Aya Mahfouz [Sat, 11 Oct 2014 00:25:34 +0000 (02:25 +0200)]
staging: vt6655: card.c: replace memcpy() by ether_addr_copy() using coccinelle
This patch focuses on fixing the following warning generated
by checkpatch.pl for the file rxtx.c :
Prefer ether_addr_copy() over memcpy() if the Ethernet addresses
are __aligned(2)
The changes were applied using the following coccinelle rule:
@@ expression e1, e2; @@
- memcpy(e1, e2, ETH_ALEN);
+ ether_addr_copy(e1, e2);
According to ether_addr_copy() description and functionality,
all Ethernet addresses should align to the u16 datatype.
Here is the output of pahole for the relevant datastructures:
struct pmkid_candidate {
NDIS_802_11_MAC_ADDRESS BSSID; /* 0 6 */
/* XXX 2 bytes hole, try to pack */
long unsigned int Flags; /* 8 4 */
/* size: 12, cachelines: 1, members: 2 */
/* sum members: 10, holes: 1, sum holes: 2 */
/* last cacheline: 12 bytes */
};
Signed-off-by: Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jes Sorensen [Fri, 10 Oct 2014 19:41:34 +0000 (21:41 +0200)]
staging: rtl8723au: Remove a stack of write only counters
We don't do anything with these, so get rid of them
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jes Sorensen [Fri, 10 Oct 2014 19:41:38 +0000 (21:41 +0200)]
staging: rtl8723au: Eliminate write-only struct wlan_network->aid
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jes Sorensen [Fri, 10 Oct 2014 19:41:37 +0000 (21:41 +0200)]
staging: rtl8723au: Remove unused struct ndis_802_11_key
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jes Sorensen [Fri, 10 Oct 2014 19:41:36 +0000 (21:41 +0200)]
staging: rtl8723au: Fold struct wlan_phy_info into struct wlan_bssid_ex
Half the entries of struct wlan_phy_info weren't used and this makes
the code a little cleaner
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jes Sorensen [Fri, 10 Oct 2014 19:41:35 +0000 (21:41 +0200)]
staging: rtl8723au: Remove unused struct zero_bulkout_content
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jes Sorensen [Fri, 10 Oct 2014 19:41:33 +0000 (21:41 +0200)]
staging: rtl8723au: Re-organize struct xmit_priv for better packing
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jes Sorensen [Fri, 10 Oct 2014 19:41:32 +0000 (21:41 +0200)]
staging: rtl8723au: Don't read REQ_NQOS_SEQ 16 bits and write back 8 bits
This fixes a potential endian bug
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jes Sorensen [Fri, 10 Oct 2014 19:41:31 +0000 (21:41 +0200)]
staging: rtl8723au: Use register define REQ_NQOS_SEQ instead of hardcoded value
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jes Sorensen [Fri, 10 Oct 2014 19:41:29 +0000 (21:41 +0200)]
staging: rtl8723au: Eliminate write-once variable xmit_priv->vcs_setting
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jes Sorensen [Fri, 10 Oct 2014 19:41:28 +0000 (21:41 +0200)]
staging: rtl8723au: Use enum values for vcs_type
Be consistent in the use of enum VCS_TYPE
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jes Sorensen [Fri, 10 Oct 2014 19:41:27 +0000 (21:41 +0200)]
staging: rtl8723au: Remove write-only struct xmit_priv->vcs_type
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jes Sorensen [Fri, 10 Oct 2014 19:41:24 +0000 (21:41 +0200)]
staging: rtl8723au: Fix alignment of mac_addr for ether_addr_copy() usage
Make sure struct eeprom_priv->mac_addr is 2 byte aligned to work with
ether_addr_copy()
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Vladimir A. Nazarenko [Fri, 10 Oct 2014 01:27:01 +0000 (12:27 +1100)]
staging: vt6655: delete SndEvt_ToAPI code
It's never enabled, so we can safely remove it.
Signed-off-by: Vladimir A. Nazarenko <naszar@ya.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tapasweni Pathak [Fri, 10 Oct 2014 02:13:36 +0000 (07:43 +0530)]
staging: vt6655: Remove unused code inside switch case
This patch removes dead code in private_ioctl function and
iwctl_siwmode function, in file ioctl.c.
Inside switch, for a case no code gets executed
after break.
This was detected by smatch.
Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
John Ledbetter [Thu, 9 Oct 2014 15:05:08 +0000 (11:05 -0400)]
staging: rtl8192e: Fix pointer type declaration style errors
This fixes the following checkpatch.pl errors:
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c:1290 error: "foo* bar"
should be "foo *bar"
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c:1305 error: "foo * bar"
should be "foo *bar"
Signed-off-by: John Ledbetter <john@throttle.io>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Rene Kolarik [Thu, 9 Oct 2014 18:29:32 +0000 (20:29 +0200)]
drivers: staging: imx-drm driver cleanup
Wrapping two too long lines in two files of the imx-drm driver.
Signed-off-by: Rene Kolarik <rene.kolarik@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Dzmitry Sledneu [Thu, 9 Oct 2014 07:22:43 +0000 (09:22 +0200)]
staging: gs_fpgaboot: Fix "out of memory" error handling
Fix "out of memory" error handling
Signed-off-by: Dzmitry Sledneu <dzmitry.sledneu@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Vladimir A. Nazarenko [Thu, 9 Oct 2014 05:33:33 +0000 (16:33 +1100)]
staging: vt6655: remove useless #if 1
There is code encapsulated in #if 1, let's remove it.
Signed-off-by: Vladimir A. Nazarenko <naszar@ya.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Daeseok Youn [Thu, 9 Oct 2014 04:40:11 +0000 (13:40 +0900)]
staging: dgap: introduce dgap_stop()
The dgap_init_module() need to unwind for cleanup variables properly.
Because dgap_init_module() calls dgap_cleanup_module() for freeing
variables but this function is possible to free variables
which are not allocated.
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Vladimir A. Nazarenko [Thu, 9 Oct 2014 04:38:23 +0000 (15:38 +1100)]
staging: vt6655: remove global variable wpa_Result
This variable unused, so remove it.
Signed-off-by: Vladimir A. Nazarenko <naszar@ya.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Vladimir A. Nazarenko [Thu, 9 Oct 2014 04:37:17 +0000 (15:37 +1100)]
staging: vt6655: delete non-standard ioctl 0xFF
Custom ioctl 0xff is legacy code that was used for
patched version of wpa_supplicant, where function
wpa_authen_Status_transfer() called this ioctl to
tell authentication status to the driver. While
from upstream was added only driver code to the
kernel but not patches to the wpa_supplicant we
can safely remove this unused ioctl.
Signed-off-by: Vladimir A. Nazarenko <naszar@ya.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Yeliz Taneroglu [Thu, 9 Oct 2014 13:35:33 +0000 (16:35 +0300)]
staging: rtl8723au: core: rtw_ap: Fix void function return statements style warning.
The following patch fixes the checkpatch.pl warning:
drivers/staging/rtl8723au/core/rtw_ap.c WARNING: void function return statements are not generally useful
Signed-off-by: Yeliz Taneroglu <yeliztaneroglu@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Yeliz Taneroglu [Thu, 9 Oct 2014 13:35:32 +0000 (16:35 +0300)]
staging: rtl8723au: core: rtw_security: Fix void function return statements style warning.
The following patch fixes the checkpatch.pl warning:
drivers/staging/rtl8723au/core/rtw_security.c WARNING: void function return statements are not generally useful
Signed-off-by: Yeliz Taneroglu <yeliztaneroglu@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Yeliz Taneroglu [Thu, 9 Oct 2014 13:35:31 +0000 (16:35 +0300)]
staging: rtl8723au: core: rtw_wlan_util: Fix void function return statements style warning.
The following patch fixes the checkpatch.pl warning:
drivers/staging/rtl8723au/core/rtw_wlan_util.c WARNING: void function return statements are not generally useful
Signed-off-by: Yeliz Taneroglu <yeliztaneroglu@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Yeliz Taneroglu [Thu, 9 Oct 2014 13:35:30 +0000 (16:35 +0300)]
staging: rtl8723au: core: rtw_pwrctrl: Fix void function return statements style warning.
The following patch fixes the checkpatch.pl warning:
drivers/staging/rtl8723au/core/rtw_pwrctrl.c WARNING: void function return statements are not generally useful
Signed-off-by: Yeliz Taneroglu <yeliztaneroglu@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Yeliz Taneroglu [Thu, 9 Oct 2014 13:35:29 +0000 (16:35 +0300)]
staging: rtl8723au: core: rtw_mlme: fix void function return statements
The following patch fixes the checkpatch.pl warning:
drivers/staging/rtl8723au/core/rtw_mlme.c WARNING: void function return statements are not generally useful
Signed-off-by: Yeliz Taneroglu <yeliztaneroglu@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tapasweni Pathak [Thu, 9 Oct 2014 02:59:11 +0000 (08:29 +0530)]
staging: rtl8192u: Remove unused code
Below return statement dm_send_rssi_tofw
function has dead code.
This patch removes dead code from dm_send_rssi_tofw.
This was detected by smatch.
Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tina Johnson [Thu, 9 Oct 2014 14:00:05 +0000 (19:30 +0530)]
Staging: lustre: Fix line over 80 characters warning
The following checkpatch warning was fixed:
WARNING: line over 80 characters
Signed-off-by: Tina Johnson <tinajohnson.1234@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Esra Altintas [Thu, 9 Oct 2014 17:20:25 +0000 (20:20 +0300)]
staging: rtl8712: Fix unnecessary parentheses style warning in rtl871x_xmit.c
This fixes the following checkpatch.pl warning:
WARNING: Unnecessary parentheses - maybe == should be = ?
Signed-off-by: Esra Altintas <es.altintas@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Esra Altintas [Thu, 9 Oct 2014 18:37:44 +0000 (21:37 +0300)]
staging: vt6655: Fixed C99 // comment errors in wpa.h
The following patch fixes the checkpatch.pl warning:
ERROR: do not use C99 // comments
Signed-off-by: Esra Altintas <es.altintas@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Dilek Uzulmez [Thu, 9 Oct 2014 19:46:32 +0000 (22:46 +0300)]
staging: vt6655: Use ether_addr_copy function
This patch fixes the following checkpatch.pl warnings:
WARNING: "Prefer ether_addr_copy() over memcpy() if the Ethernet
addresses are __aligned(2)" in file device_main.c
Pahole shows that the addresses are aligned
Signed-off-by: Dilek Uzulmez <dilekuzulmez@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Yeliz Taneroglu [Wed, 8 Oct 2014 22:22:19 +0000 (01:22 +0300)]
staging: rtl8723au: core: rtw_xmit: Add blank line after declarations
The following patch fixes the checkpatch.pl warning:
drivers/staging/rtl8723au/core/rtw_xmit.c WARNING: Missing a blank line after declarations
Signed-off-by: Yeliz Taneroglu <yeliztaneroglu@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Yeliz Taneroglu [Wed, 8 Oct 2014 22:22:18 +0000 (01:22 +0300)]
staging: rtl8723au: core: rtw_recv: Add blank line after declarations
The following patch fixes the checkpatch.pl warning:
drivers/staging/rtl8723au/core/rtw_recv.c WARNING: Missing a blank line after declarations
Signed-off-by: Yeliz Taneroglu <yeliztaneroglu@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Yeliz Taneroglu [Wed, 8 Oct 2014 22:22:17 +0000 (01:22 +0300)]
staging: rtl8723au: core: rtw_wlan_util: Add blank line after declarations
The following patch fixes the checkpatch.pl warning:
drivers/staging/rtl8723au/core/rtw_wlan_util.c WARNING: Missing a blank line after declarations
Signed-off-by: Yeliz Taneroglu <yeliztaneroglu@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Yeliz Taneroglu [Wed, 8 Oct 2014 22:22:16 +0000 (01:22 +0300)]
staging: rtl8723au: core: rtw_pwrctrl: Add blank line after declarations
The following patch fixes the checkpatch.pl warning:
drivers/staging/rtl8723au/core/rtw_pwrctrl.c WARNING: Missing a blank line after declarations
Signed-off-by: Yeliz Taneroglu <yeliztaneroglu@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Yeliz Taneroglu [Wed, 8 Oct 2014 22:22:15 +0000 (01:22 +0300)]
staging: rtl8723au: core: rtw_mlme_ext: Add blank line after declarations
The following patch fixes the checkpatch.pl warning:
drivers/staging/rtl8723au/core/rtw_mlme_ext.c WARNING: Missing a blank line after declarations
Signed-off-by: Yeliz Taneroglu <yeliztaneroglu@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Yeliz Taneroglu [Wed, 8 Oct 2014 22:22:14 +0000 (01:22 +0300)]
staging: rtl8723au: core: rtw_mlme: Add blank line after declarations
The following patch fixes the checkpatch.pl warning:
drivers/staging/rtl8723au/core/rtw_mlme.c WARNING: Missing a blank line after declarations
Signed-off-by: Yeliz Taneroglu <yeliztaneroglu@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Yeliz Taneroglu [Wed, 8 Oct 2014 22:22:13 +0000 (01:22 +0300)]
staging: rtl8723au: core: rtw_led: Add blank line after declarations
The following patch fixes the checkpatch.pl warning:
drivers/staging/rtl8723au/core/rtw_led.c WARNING: Missing a blank line after declarations
Signed-off-by: Yeliz Taneroglu <yeliztaneroglu@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Yeliz Taneroglu [Wed, 8 Oct 2014 22:22:12 +0000 (01:22 +0300)]
staging: rtl8723au: core: rtw_ieee80211: Add blank line after declarations
The following patch fixes the checkpatch.pl warning:
drivers/staging/rtl8723au/core/rtw_ieee80211.c Warning: Missing a blank line after declarations
Signed-off-by: Yeliz Taneroglu <yeliztaneroglu@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Yeliz Taneroglu [Wed, 8 Oct 2014 22:22:10 +0000 (01:22 +0300)]
staging: rtl8723au: core: rtw_cmd: Add blank line after declarations
The following patch fixes the checkpatch.pl warning:
drivers/staging/rtl8723au/core/rtw_ap.c Warning: Missing a blank line after declarations
Signed-off-by: Yeliz Taneroglu <yeliztaneroglu@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Roberto Medina [Wed, 8 Oct 2014 19:18:44 +0000 (21:18 +0200)]
Staging: octeon: ethernet-tx: fixed coding style warnings, missing blank lines
Fixed coding style warnings due to missing blank lines.
Dubious additions removed.
Signed-off-by: Roberto Medina <robertoxmed@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Aleh Suprunovich [Tue, 7 Oct 2014 11:52:52 +0000 (14:52 +0300)]
staging: octeon-usb: fix checkpatch.pl warnings
fixed several 'line over 80 characters' in places where it can be done
without changing/refactoring code
Signed-off-by: Aleh Suprunovich <br@ahlamon.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Giedrius Statkevičius [Fri, 3 Oct 2014 21:31:21 +0000 (00:31 +0300)]
staging: rts5208: use ternary operators to reduce indentation level
Convert code in format of if (a) if(b) { [...] } to one line with a
simple ternary operation to avoid unnecesary increase of indentation
level.
Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Giedrius Statkevičius [Fri, 3 Oct 2014 21:31:20 +0000 (00:31 +0300)]
staging: rts5208: divide lines to make them less than 80 characters long
Make a couple of lines shorter than the max limit by diving them and
also make sure to align them properly where possible.
Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Giedrius Statkevičius [Fri, 3 Oct 2014 21:31:19 +0000 (00:31 +0300)]
staging: rts5208: align divided lines to opening paranthesis
Make all divided lines aligned to the opening paranthesis.
Basically makes all lines aligned to the opening paranthesis to make the
code more readable and it also gets rid of a lot of checkpatch.pl
"checks".
Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Giedrius Statkevičius [Fri, 3 Oct 2014 21:31:18 +0000 (00:31 +0300)]
staging: rts5208: get rid of Camel Case, remove unneeded lines and parantheses
Convert labels from Camel Case to lower case, remove unnecessary
parantheses around operands of dereference operators and remove unneeded
empty lines before }.
Gets rid of a checkpatch.pl "check" that code should avoid Camel Case,
also the code had a bunch of &(a) where a is some variable so it gets
rid of them too. Finally, in a few places there were a empty line
before } so remove them.
Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Giedrius Statkevičius [Fri, 3 Oct 2014 21:31:17 +0000 (00:31 +0300)]
staging: rts5208: combine ifs where possible
Join together chained if's where possible to lower the indentation
level.
In a lot of places of this code the indentation level is already very
high.
As a result, this patch increases the code flow and readability.
Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Greg Donald [Fri, 3 Oct 2014 15:36:40 +0000 (10:36 -0500)]
drivers: staging: rtl8723au: Fix "open brace '{' following struct go on the same line" errors
Fix checkpatch.pl "open brace '{' following struct go on the same line" errors
Signed-off-by: Greg Donald <gdonald@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Greg Donald [Thu, 2 Oct 2014 23:28:41 +0000 (18:28 -0500)]
drivers: staging: rtl8723au: core: Fix "'foo * bar' should be 'foo *bar'" errors
Fix checkpatch.pl "'foo * bar' should be 'foo *bar'" errors
Signed-off-by: Greg Donald <gdonald@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Soren Brinkmann [Thu, 2 Oct 2014 16:13:35 +0000 (09:13 -0700)]
staging: Add Xilinx Clocking Wizard driver
Add a driver for the Xilinx Clocking Wizard soft IP. The clocking wizard
provides an AXI interface to dynamically reconfigure the clocking
resources of Xilinx FPGAs.
Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Joe Perches [Tue, 7 Oct 2014 15:53:20 +0000 (17:53 +0200)]
staging: gs_fpgaboot: Use print_hex_dump_bytes instead of pr_info
Use print_hex_dump_bytes instead of pr_info
Signed-off-by: Dzmitry Sledneu <dzmitry.sledneu@gmail.com>
Reviewed-by: Insop Song <insop.song@gainspeed.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Serguey Parkhomovsky [Wed, 8 Oct 2014 03:42:45 +0000 (20:42 -0700)]
staging: rtl8712: fix unnecessary elses after return/break in rtl8712_efuse.c
This patch fixes two unnecessary else conditions that were found by checkpatch.pl.
Signed-off-by: Serguey Parkhomovsky <sergueyparkhomovsky@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Nitin Kuppelur [Wed, 1 Oct 2014 15:04:27 +0000 (17:04 +0200)]
Staging: rtl8712:ieee80211 remove unnecessary else
Removed unnecessary else after return/break to solve
checkpatch.pl warning
Signed-off-by: Nitin Kuppelur <nitinkuppelur@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Daeseok Youn [Wed, 8 Oct 2014 11:13:21 +0000 (20:13 +0900)]
staging: dgap: change function names properly
dgap_do_remap() and dgap_release_remap() names could be
changed to dgap_remap() and dgap_unmap().
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Daeseok Youn [Wed, 8 Oct 2014 11:12:48 +0000 (20:12 +0900)]
staging: dgap: remove unnecessary if statement for checking NULL
dgap_release_remap() function is only called after the memory
has been remapped so if statement for checking NULL doesn't
need.
And also release_mem_region() calls are moved after iounmap() calls.
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Rahul Bedarkar [Wed, 1 Oct 2014 17:11:36 +0000 (22:41 +0530)]
staging: dgap: remove unused variable 'orig_count'
This patch fixes sparse warning
warning: variable ‘orig_count’ set but not used [-Wunused-but-set-variable]
Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Rahul Bedarkar [Wed, 1 Oct 2014 16:56:01 +0000 (22:26 +0530)]
staging: bcm: fix sparse warning in module_param
This patch fixes sparse warning in module_param
warning: pointer targets in return differ in signedness [-Wpointer-sign]
Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 18 Sep 2014 18:46:06 +0000 (11:46 -0700)]
staging: comedi: comedi_fc.h: remove cfc_inc_scan_progress()
This inline function is no longer used. Remove it.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 18 Sep 2014 18:46:05 +0000 (11:46 -0700)]
staging: comedi: mite: use comedi_inc_scan_progress()
This inline function is just a wrapper around comedi_inc_scan_progress().
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 18 Sep 2014 18:41:20 +0000 (11:41 -0700)]
staging: comedi: comedi_fc.h: remove cfc_bytes_per_scan()
This inline function is no longer used. Remove it.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 18 Sep 2014 18:41:19 +0000 (11:41 -0700)]
staging: comedi: pcl818: use comedi_bytes_per_scan()
This inline function is just a wrapper around comedi_bytes_per_scan().
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 18 Sep 2014 18:41:18 +0000 (11:41 -0700)]
staging: comedi: pcl816: use comedi_bytes_per_scan()
This inline function is just a wrapper around comedi_bytes_per_scan().
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 18 Sep 2014 18:41:17 +0000 (11:41 -0700)]
staging: comedi: pcl812: use comedi_bytes_per_scan()
This inline function is just a wrapper around comedi_bytes_per_scan().
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 18 Sep 2014 18:41:16 +0000 (11:41 -0700)]
staging: comedi: mite: use comedi_bytes_per_scan()
This inline function is just a wrapper around comedi_bytes_per_scan().
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 18 Sep 2014 18:41:15 +0000 (11:41 -0700)]
staging: comedi: das16: use comedi_bytes_per_scan()
This inline function is just a wrapper around comedi_bytes_per_scan().
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 18 Sep 2014 18:41:14 +0000 (11:41 -0700)]
staging: comedi: amplc_pci230: use comedi_bytes_per_scan()
This inline function is just a wrapper around comedi_bytes_per_scan().
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 18 Sep 2014 18:41:13 +0000 (11:41 -0700)]
staging: comedi: amplc_pci224: use comedi_bytes_per_scan()
This inline function is just a wrapper around comedi_bytes_per_scan().
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 18 Sep 2014 18:35:42 +0000 (11:35 -0700)]
staging: comedi: amplc_pci230: use comedi_handle_events()
Use comedi_handle_events() to automatically (*cancel) the async command
for an end-of-acquisition or if an error/overflow occurs.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 18 Sep 2014 18:35:41 +0000 (11:35 -0700)]
staging: comedi: rtd520: use comedi_handle_events()
Use comedi_handle_events() to automatically (*cancel) the async command
for an end-of-acquisition or if an error/overflow occurs.
The code to cancel the async command can then be removed from rtd_interrupt().
Since the (*cancel) will also clear the FIFO, the ai_read_dregs() function
can also be removed.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 18 Sep 2014 18:35:40 +0000 (11:35 -0700)]
staging: comedi: rtd520: clear FIFO when canceling async command
Clear the A/D FIFO as part of the analog input (*cancel) to help with
cleaning up the async command.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 18 Sep 2014 18:35:39 +0000 (11:35 -0700)]
staging: comedi: s626: use comedi_handle_events()
Use comedi_handle_events() to automatically (*cancel) the async command
for an end-of-acquisition or if an error/overflow occurs.
The s626_mc_disable() call when the end-of-acquisition is detected can
then be removed. The (*cancel) does the same thing.
For aesthetics, also remove the 'finished' local variable and just return
the ai_cmd_running state.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 18 Sep 2014 18:35:38 +0000 (11:35 -0700)]
staging: comedi: pcmuio: use comedi_handle_events()
Use comedi_handle_events() to automatically (*cancel) the async command
for an end-of-acquisition or if an error/overflow occurs.
Also, comedi_handle_events() does nothing if no events are set so the
local variable 'oldevents' can be removed.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 18 Sep 2014 18:35:37 +0000 (11:35 -0700)]
staging: comedi: pcmmio: use comedi_handle_events()
Use comedi_handle_events() to automatically (*cancel) the async command
for an end-of-acquisition or if an error/overflow occurs.
Also, comedi_handle_events() does nothing if no events are set so the
local variable 'oldevents' can be removed.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>