From 879be45aeaa433daa5b848e5c3bc66f85ed6bf4a Mon Sep 17 00:00:00 2001 From: Peter Senna Tschudin Date: Wed, 16 Jul 2014 18:13:43 +0200 Subject: [PATCH] staging: vt6556: Remove typedefs This patch removes uneeded typedefs reported by chackpatch and removes one enum that is not in use. As checkpatch complained about the typedef and the enum is not being used, this patch removes both typedef and enum. The removed enum from card.h: typedef enum _CARD_PHY_TYPE { PHY_TYPE_AUTO = 0, PHY_TYPE_11B, PHY_TYPE_11G, PHY_TYPE_11A } CARD_PHY_TYPE, *PCARD_PHY_TYPE; The following typedefs were removed, but enums were kept at device.h: typedef enum __device_msg_level typedef enum __DEVICE_NDIS_STATUS Tested by compilation only. Signed-off-by: Peter Senna Tschudin Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/card.h | 7 ------- drivers/staging/vt6656/device.h | 17 ++++++++--------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/drivers/staging/vt6656/card.h b/drivers/staging/vt6656/card.h index 80fcd531207c..03fc1678896b 100644 --- a/drivers/staging/vt6656/card.h +++ b/drivers/staging/vt6656/card.h @@ -32,13 +32,6 @@ /* init card type */ -typedef enum _CARD_PHY_TYPE { - PHY_TYPE_AUTO = 0, - PHY_TYPE_11B, - PHY_TYPE_11G, - PHY_TYPE_11A -} CARD_PHY_TYPE, *PCARD_PHY_TYPE; - #define CB_MAX_CHANNEL_24G 14 #define CB_MAX_CHANNEL_5G 42 /* add channel9(5045MHz), 41==>42 */ #define CB_MAX_CHANNEL (CB_MAX_CHANNEL_24G + CB_MAX_CHANNEL_5G) diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index b23d8444dfff..dbd58103accc 100644 --- a/drivers/staging/vt6656/device.h +++ b/drivers/staging/vt6656/device.h @@ -187,13 +187,13 @@ #define DBG_PRT(l, p, args...) { if (l <= msglevel) printk(p, ##args); } -typedef enum __device_msg_level { +enum { MSG_LEVEL_ERR = 0, /* Errors causing abnormal operation */ MSG_LEVEL_NOTICE = 1, /* Errors needing user notification */ MSG_LEVEL_INFO = 2, /* Normal message. */ MSG_LEVEL_VERBOSE = 3, /* Will report all trival errors. */ MSG_LEVEL_DEBUG = 4 /* Only for debug purpose. */ -} DEVICE_MSG_LEVEL, *PDEVICE_MSG_LEVEL; +}; #define DEVICE_INIT_COLD 0x0 /* cold init */ #define DEVICE_INIT_RESET 0x1 /* reset init or Dx to D0 power remain */ @@ -268,13 +268,12 @@ struct vnt_interrupt_buffer { /*++ NDIS related */ -typedef enum __DEVICE_NDIS_STATUS { - STATUS_SUCCESS = 0, - STATUS_FAILURE, - STATUS_RESOURCES, - STATUS_PENDING, -} DEVICE_NDIS_STATUS, *PDEVICE_NDIS_STATUS; - +enum { + STATUS_SUCCESS = 0, + STATUS_FAILURE, + STATUS_RESOURCES, + STATUS_PENDING, +}; /* flags for options */ #define DEVICE_FLAGS_UNPLUG 0x00000001UL -- 2.30.2