Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b777e3e1 authored by Sergio Paracuellos's avatar Sergio Paracuellos Committed by Greg Kroah-Hartman
Browse files

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: default avatarSergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 477c5eb5

drivers/staging/ks7010/ks7010_sdio.h

+0 −5
Original line number Diff line number Diff line
@@ -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

drivers/staging/ks7010/ks_hostif.h

+4 −6
Original line number Diff line number Diff line
@@ -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__ */