diff options
| author | Sergio Paracuellos <sergio.paracuellos@gmail.com> | 2018-04-06 14:37:41 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-04-23 14:27:35 +0200 |
| commit | b777e3e1525c308964c8c2e5d4b018a6172eb182 (patch) | |
| tree | ce83ea9ee01837371d84c181747deb8f11c19bd4 | |
| parent | 477c5eb5ebc68f986073b6956dd863f8b0410f1e (diff) | |
staging: ks7010: move and rename DEVICE_ALIGNMENT into correct header
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>
| -rw-r--r-- | drivers/staging/ks7010/ks7010_sdio.h | 5 | ||||
| -rw-r--r-- | drivers/staging/ks7010/ks_hostif.h | 10 |
2 files changed, 4 insertions, 11 deletions
diff --git a/drivers/staging/ks7010/ks7010_sdio.h b/drivers/staging/ks7010/ks7010_sdio.h index e4f56a11c888..3f658451a91a 100644 --- a/drivers/staging/ks7010/ks7010_sdio.h +++ b/drivers/staging/ks7010/ks7010_sdio.h @@ -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 diff --git a/drivers/staging/ks7010/ks_hostif.h b/drivers/staging/ks7010/ks_hostif.h index aa481c00a324..9e573b109e54 100644 --- a/drivers/staging/ks7010/ks_hostif.h +++ b/drivers/staging/ks7010/ks_hostif.h @@ -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__ */ |