Commit 702d8d0f authored by Gargi Sharma's avatar Gargi Sharma Committed by Greg Kroah-Hartman

staging: vc04_services: Replace typedef with struct

Using typedef for a structure type and upper case struct names is not
suggested in Linux kernel coding style guidelines. Hence, occurences
of typedefs have been removed and struct names converted to lowercase
in the file. Grep was also used to ensure that all occurence of the
typedefs have been removed. The module compiles without any warnings
or errors.

Script 1:
@r1@
type T;
@@

typedef struct { ... } T;

@script:python c1@
T2;
T << r1.T;
@@
if T[-2:] =="_T":
  coccinelle.T2 = T[:-2].lower();
  print T
else:
  coccinelle.T2=T.lower();

@r2@
type r1.T;
identifier c1.T2;
@@
-typedef
struct
+ T2
{ ... }
-T
;

@r3@
type r1.T;
identifier c1.T2;
@@
- T
+ struct T2

Script 2:
@@
typedef VCHIQ_ELEMENT_T;
@@

(
- VCHIQ_ELEMENT_T
+ struct vchiq_element
)
Signed-off-by: default avatarGargi Sharma <gs051095@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 363c6fef
...@@ -413,7 +413,7 @@ static void close_delivered(USER_SERVICE_T *user_service) ...@@ -413,7 +413,7 @@ static void close_delivered(USER_SERVICE_T *user_service)
} }
struct vchiq_io_copy_callback_context { struct vchiq_io_copy_callback_context {
VCHIQ_ELEMENT_T *current_element; struct vchiq_element *current_element;
size_t current_element_offset; size_t current_element_offset;
unsigned long elements_to_go; unsigned long elements_to_go;
size_t current_offset; size_t current_offset;
...@@ -490,7 +490,7 @@ vchiq_ioc_copy_element_data( ...@@ -490,7 +490,7 @@ vchiq_ioc_copy_element_data(
**************************************************************************/ **************************************************************************/
static VCHIQ_STATUS_T static VCHIQ_STATUS_T
vchiq_ioc_queue_message(VCHIQ_SERVICE_HANDLE_T handle, vchiq_ioc_queue_message(VCHIQ_SERVICE_HANDLE_T handle,
VCHIQ_ELEMENT_T *elements, struct vchiq_element *elements,
unsigned long count) unsigned long count)
{ {
struct vchiq_io_copy_callback_context context; struct vchiq_io_copy_callback_context context;
...@@ -761,10 +761,10 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) ...@@ -761,10 +761,10 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
if ((service != NULL) && (args.count <= MAX_ELEMENTS)) { if ((service != NULL) && (args.count <= MAX_ELEMENTS)) {
/* Copy elements into kernel space */ /* Copy elements into kernel space */
VCHIQ_ELEMENT_T elements[MAX_ELEMENTS]; struct vchiq_element elements[MAX_ELEMENTS];
if (copy_from_user(elements, args.elements, if (copy_from_user(elements, args.elements,
args.count * sizeof(VCHIQ_ELEMENT_T)) == 0) args.count * sizeof(struct vchiq_element)) == 0)
status = vchiq_ioc_queue_message status = vchiq_ioc_queue_message
(args.handle, (args.handle,
elements, args.count); elements, args.count);
...@@ -1323,7 +1323,7 @@ vchiq_compat_ioctl_queue_message(struct file *file, ...@@ -1323,7 +1323,7 @@ vchiq_compat_ioctl_queue_message(struct file *file,
unsigned long arg) unsigned long arg)
{ {
VCHIQ_QUEUE_MESSAGE_T *args; VCHIQ_QUEUE_MESSAGE_T *args;
VCHIQ_ELEMENT_T *elements; struct vchiq_element *elements;
struct vchiq_queue_message32 args32; struct vchiq_queue_message32 args32;
unsigned int count; unsigned int count;
...@@ -1349,7 +1349,7 @@ vchiq_compat_ioctl_queue_message(struct file *file, ...@@ -1349,7 +1349,7 @@ vchiq_compat_ioctl_queue_message(struct file *file,
if (args32.elements && args32.count) { if (args32.elements && args32.count) {
struct vchiq_element32 tempelement32[MAX_ELEMENTS]; struct vchiq_element32 tempelement32[MAX_ELEMENTS];
elements = (VCHIQ_ELEMENT_T __user *)(args + 1); elements = (struct vchiq_element __user *)(args + 1);
if (copy_from_user(&tempelement32, if (copy_from_user(&tempelement32,
compat_ptr(args32.elements), compat_ptr(args32.elements),
......
...@@ -88,10 +88,10 @@ typedef struct vchiq_header_struct { ...@@ -88,10 +88,10 @@ typedef struct vchiq_header_struct {
char data[0]; /* message */ char data[0]; /* message */
} VCHIQ_HEADER_T; } VCHIQ_HEADER_T;
typedef struct { struct vchiq_element {
const void *data; const void *data;
unsigned int size; unsigned int size;
} VCHIQ_ELEMENT_T; };
typedef unsigned int VCHIQ_SERVICE_HANDLE_T; typedef unsigned int VCHIQ_SERVICE_HANDLE_T;
......
...@@ -50,7 +50,7 @@ typedef struct { ...@@ -50,7 +50,7 @@ typedef struct {
typedef struct { typedef struct {
unsigned int handle; unsigned int handle;
unsigned int count; unsigned int count;
const VCHIQ_ELEMENT_T *elements; const struct vchiq_element *elements;
} VCHIQ_QUEUE_MESSAGE_T; } VCHIQ_QUEUE_MESSAGE_T;
typedef struct { typedef struct {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment