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

Commit 74d48466 authored by Andrzej Pietrasiewicz's avatar Andrzej Pietrasiewicz Committed by Felipe Balbi
Browse files

usb: gadget: FunctionFS: share VLA macros with all usb gadget files 



Variable Length Array macros allow portable (compilable with both gcc
and clang) way of allocating a number of structures using a single
memory chunk. They can be useful for files other than f_fs.c,
so move them to a header file.

Signed-off-by: default avatarAndrzej Pietrasiewicz <andrzej.p@samsung.com>
Acked-by: default avatarMichal Nazarewicz <mina86@mina86.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 10f0577a

drivers/usb/gadget/f_fs.c

+1 −26
Original line number Diff line number Diff line
@@ -33,36 +33,11 @@ 
#include <linux/poll.h>



#include "u_fs.h"

#include "u_f.h"

#include "configfs.h"



#define FUNCTIONFS_MAGIC	0xa647361 /* Chosen by a honest dice roll ;) */



/* Variable Length Array Macros **********************************************/

#define vla_group(groupname) size_t groupname##__next = 0

#define vla_group_size(groupname) groupname##__next



#define vla_item(groupname, type, name, n) \

	size_t groupname##_##name##__offset = ({			       \

		size_t align_mask = __alignof__(type) - 1;		       \

		size_t offset = (groupname##__next + align_mask) & ~align_mask;\

		size_t size = (n) * sizeof(type);			       \

		groupname##__next = offset + size;			       \

		offset;							       \

	})



#define vla_item_with_sz(groupname, type, name, n) \

	size_t groupname##_##name##__sz = (n) * sizeof(type);		       \

	size_t groupname##_##name##__offset = ({			       \

		size_t align_mask = __alignof__(type) - 1;		       \

		size_t offset = (groupname##__next + align_mask) & ~align_mask;\

		size_t size = groupname##_##name##__sz;			       \

		groupname##__next = offset + size;			       \

		offset;							       \

	})



#define vla_ptr(ptr, groupname, name) \

	((void *) ((char *)ptr + groupname##_##name##__offset))



/* Reference counter handling */

static void ffs_data_get(struct ffs_data *ffs);

static void ffs_data_put(struct ffs_data *ffs);

drivers/usb/gadget/u_f.h

+26 −0
Original line number Diff line number Diff line
@@ -16,6 +16,32 @@ 
#ifndef __U_F_H__

#define __U_F_H__



/* Variable Length Array Macros **********************************************/

#define vla_group(groupname) size_t groupname##__next = 0

#define vla_group_size(groupname) groupname##__next



#define vla_item(groupname, type, name, n) \

	size_t groupname##_##name##__offset = ({			       \

		size_t align_mask = __alignof__(type) - 1;		       \

		size_t offset = (groupname##__next + align_mask) & ~align_mask;\

		size_t size = (n) * sizeof(type);			       \

		groupname##__next = offset + size;			       \

		offset;							       \

	})



#define vla_item_with_sz(groupname, type, name, n) \

	size_t groupname##_##name##__sz = (n) * sizeof(type);		       \

	size_t groupname##_##name##__offset = ({			       \

		size_t align_mask = __alignof__(type) - 1;		       \

		size_t offset = (groupname##__next + align_mask) & ~align_mask;\

		size_t size = groupname##_##name##__sz;			       \

		groupname##__next = offset + size;			       \

		offset;							       \

	})



#define vla_ptr(ptr, groupname, name) \

	((void *) ((char *)ptr + groupname##_##name##__offset))



struct usb_ep;

struct usb_request;