mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-13 10:38:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: ks7010: move and rename DEVICE_ALIGNMENT into correct header

Browse Source 
This commit moves DEVICE_ALIGNMENT definition into the header ks_hostif.h
which is where it is being used. This is also defined always so just
remove nosense undef definitions also and clean some preprocessor
conditional directives in hif_align_size function.

Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sergio Paracuellos
2018-04-06 14:37:41 +02:00
committed by Greg Kroah-Hartman
parent 477c5eb5eb
commit b777e3e152
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/ks7010/ks7010_sdio.h
View File

@@ -11,11 +11,6 @@
#ifndef _KS7010_SDIO_H
#define _KS7010_SDIO_H
#ifdef DEVICE_ALIGNMENT
#undef DEVICE_ALIGNMENT
#endif
#define DEVICE_ALIGNMENT 32
/* SDIO KeyStream vendor and device */
#define SDIO_VENDOR_ID_KS_CODE_A 0x005b
#define SDIO_VENDOR_ID_KS_CODE_B 0x0023

10
drivers/staging/ks7010/ks_hostif.h
View File

@@ -559,6 +559,8 @@ void send_packet_complete(struct ks_wlan_private *priv, struct sk_buff *skb);
void ks_wlan_hw_wakeup_request(struct ks_wlan_private *priv);
int ks_wlan_hw_power_save(struct ks_wlan_private *priv);
#define KS7010_SIZE_ALIGNMENT 32
static
inline int hif_align_size(int size)
{
@@ -566,12 +568,8 @@ inline int hif_align_size(int size)
if (size < 1024)
size = 1024;
#endif
#ifdef DEVICE_ALIGNMENT
return (size % DEVICE_ALIGNMENT) ? size + DEVICE_ALIGNMENT -
(size % DEVICE_ALIGNMENT) : size;
#else
return size;
#endif
return (size % KS7010_SIZE_ALIGNMENT) ? size + KS7010_SIZE_ALIGNMENT -
(size % KS7010_SIZE_ALIGNMENT) : size;
}
#endif /* __KERNEL__ */