Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-25 14:56:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

usb: composite: Move bitmap related operations to ./include/linux/bitmap.h

Browse source 
The BITMAP related operations can now be moved to ./include/linux/bitmap.h
file to mimic the Linux kernel directory tree.

This change also allows to remove the lin_gadget_compat.h header file
(which is a legacy code only for composite U-boot layer).
It was also possible to remove #includes from several USB gadget drivers.

Signed-off-by: Lukasz Majewski <lukma@denx.de>
Reviewed-by: Stefan Agner <stefan.agner@toradex.com>
This commit is contained in:
Lukasz Majewski 2018-11-23 17:36:19 +01:00 • committed by Marek Vasut
parent bb00a015d6
commit 916fa09799
14 changed files with 28 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/usb/dwc3/gadget.c
View file

@ -16,7 +16,6 @@
#include <common.h> #include <common.h>
#include <malloc.h> #include <malloc.h>
#include <asm/dma-mapping.h> #include <asm/dma-mapping.h>
#include <usb/lin_gadget_compat.h>
#include <linux/bug.h> #include <linux/bug.h>
#include <linux/list.h> #include <linux/list.h>

1
drivers/usb/dwc3/ti_usb_phy.c
View file

@ -19,7 +19,6 @@
#include <common.h> #include <common.h>
#include <malloc.h> #include <malloc.h>
#include <ti-usb-phy-uboot.h> #include <ti-usb-phy-uboot.h>
#include <usb/lin_gadget_compat.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>

1
drivers/usb/eth/r8152.c
View file

@ -10,7 +10,6 @@
#include <malloc.h> #include <malloc.h>
#include <memalign.h> #include <memalign.h>
#include <usb.h> #include <usb.h>
#include <usb/lin_gadget_compat.h>
#include <linux/mii.h> #include <linux/mii.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include "usb_ether.h" #include "usb_ether.h"

1
drivers/usb/gadget/at91_udc.c
View file

@ -24,7 +24,6 @@
#include <linux/usb/gadget.h> #include <linux/usb/gadget.h>
#include <linux/usb/at91_udc.h> #include <linux/usb/at91_udc.h>
#include <malloc.h> #include <malloc.h>
#include <usb/lin_gadget_compat.h>
#include "at91_udc.h" #include "at91_udc.h"

1
drivers/usb/gadget/atmel_usba_udc.c
View file

@ -16,7 +16,6 @@
#include <linux/usb/gadget.h> #include <linux/usb/gadget.h>
#include <linux/usb/atmel_usba_udc.h> #include <linux/usb/atmel_usba_udc.h>
#include <malloc.h> #include <malloc.h>
#include <usb/lin_gadget_compat.h>
#include "atmel_usba_udc.h" #include "atmel_usba_udc.h"

1
drivers/usb/gadget/dwc2_udc_otg.c
View file

@ -33,7 +33,6 @@
#include "dwc2_udc_otg_regs.h" #include "dwc2_udc_otg_regs.h"
#include "dwc2_udc_otg_priv.h" #include "dwc2_udc_otg_priv.h"
#include <usb/lin_gadget_compat.h>
/***********************************************************/ /***********************************************************/

1
drivers/usb/gadget/dwc2_udc_otg_phy.c
View file

@ -33,7 +33,6 @@
#include "dwc2_udc_otg_regs.h" #include "dwc2_udc_otg_regs.h"
#include "dwc2_udc_otg_priv.h" #include "dwc2_udc_otg_priv.h"
#include <usb/lin_gadget_compat.h>
#include <usb/dwc2_udc.h> #include <usb/dwc2_udc.h>

1
drivers/usb/gadget/dwc2_udc_otg_priv.h
View file

@ -12,7 +12,6 @@
#include <linux/usb/ch9.h> #include <linux/usb/ch9.h>
#include <linux/usb/gadget.h> #include <linux/usb/gadget.h>
#include <linux/list.h> #include <linux/list.h>
#include <usb/lin_gadget_compat.h>
#include <usb/dwc2_udc.h> #include <usb/dwc2_udc.h>
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/

2
drivers/usb/gadget/f_mass_storage.c
View file

@ -256,7 +256,7 @@
#include <linux/usb/gadget.h> #include <linux/usb/gadget.h>
#include <linux/usb/gadget.h> #include <linux/usb/gadget.h>
#include <linux/usb/composite.h> #include <linux/usb/composite.h>
#include <usb/lin_gadget_compat.h> #include <linux/bitmap.h>
#include <g_dnl.h> #include <g_dnl.h>
/*------------------------------------------------------------------------*/ /*------------------------------------------------------------------------*/

1
drivers/usb/gadget/pxa25x_udc.c
View file

@ -29,7 +29,6 @@
#include <linux/usb/ch9.h> #include <linux/usb/ch9.h>
#include <linux/usb/gadget.h> #include <linux/usb/gadget.h>
#include <usb/lin_gadget_compat.h>
#include <asm/arch/pxa-regs.h> #include <asm/arch/pxa-regs.h>
#include "pxa25x_udc.h" #include "pxa25x_udc.h"

23
include/linux/bitmap.h Normal file
View file

@ -0,0 +1,23 @@
// SPDX-License-Identifier: GPL-2.0+
#ifndef __LINUX_BITMAP_H
#define __LINUX_BITMAP_H
#include <asm/types.h>
#include <linux/types.h>
#include <linux/bitops.h>
#define small_const_nbits(nbits) \
(__builtin_constant_p(nbits) && (nbits) <= BITS_PER_LONG)
static inline void bitmap_zero(unsigned long *dst, int nbits)
{
if (small_const_nbits(nbits)) {
*dst = 0UL;
} else {
int len = BITS_TO_LONGS(nbits) * sizeof(unsigned long);
memset(dst, 0, len);
}
}
#endif /* __LINUX_BITMAP_H */

3
include/linux/types.h
View file

@ -158,4 +158,7 @@ struct ustat {
char f_fpack[6]; char f_fpack[6];
}; };
#define DECLARE_BITMAP(name, bits) \
unsigned long name[BITS_TO_LONGS(bits)]
#endif /* _LINUX_TYPES_H */ #endif /* _LINUX_TYPES_H */

2
include/linux/usb/composite.h
View file

@ -24,7 +24,7 @@
#include <common.h> #include <common.h>
#include <linux/usb/ch9.h> #include <linux/usb/ch9.h>
#include <linux/usb/gadget.h> #include <linux/usb/gadget.h>
#include <usb/lin_gadget_compat.h> #include <linux/bitmap.h>
/* /*
* USB function drivers should return USB_GADGET_DELAYED_STATUS if they * USB function drivers should return USB_GADGET_DELAYED_STATUS if they

35
include/usb/lin_gadget_compat.h
View file

@ -1,35 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2011 Samsung Electronics
* Lukasz Majewski <l.majewski@samsung.com>
*
* This is a Linux kernel compatibility layer for USB Gadget
*/
#ifndef __LIN_COMPAT_H__
#define __LIN_COMPAT_H__
#include <linux/bitops.h>
#include <linux/compat.h>
/* common */
#define DECLARE_BITMAP(name, bits) \
unsigned long name[BITS_TO_LONGS(bits)]
#define small_const_nbits(nbits) \
(__builtin_constant_p(nbits) && (nbits) <= BITS_PER_LONG)
static inline void bitmap_zero(unsigned long *dst, int nbits)
{
if (small_const_nbits(nbits))
*dst = 0UL;
else {
int len = BITS_TO_LONGS(nbits) * sizeof(unsigned long);
memset(dst, 0, len);
}
}
#define dma_cache_maint(addr, size, mode) cache_flush()
void cache_flush(void);
#endif /* __LIN_COMPAT_H__ */