From eb55b5b48088924da1b7bab494fc6c21f91ffa7b Mon Sep 17 00:00:00 2001 From: Kristina Martšenko Date: Mon, 3 Mar 2014 23:05:46 +0200 Subject: staging: sbe-2t3e3: remove t3e3_resp_t typedef MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Kernel coding style does not recommend using typedefs for structures, so remove the t3e3_resp_t typedef. Fix the following checkpatch warning: drivers/staging/sbe-2t3e3/ctrl.h:123: WARNING: do not add new typedefs Signed-off-by: Kristina Martšenko Signed-off-by: Greg Kroah-Hartman --- drivers/staging/sbe-2t3e3/2t3e3.h | 3 +-- drivers/staging/sbe-2t3e3/ctrl.c | 2 +- drivers/staging/sbe-2t3e3/ctrl.h | 4 ++-- drivers/staging/sbe-2t3e3/netdev.c | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/staging/sbe-2t3e3/2t3e3.h b/drivers/staging/sbe-2t3e3/2t3e3.h index 0f078e212f73..e7bf721f3fd1 100644 --- a/drivers/staging/sbe-2t3e3/2t3e3.h +++ b/drivers/staging/sbe-2t3e3/2t3e3.h @@ -760,8 +760,7 @@ void t3e3_init(struct channel *); void t3e3_if_up(struct channel *); void t3e3_if_down(struct channel *); int t3e3_if_start_xmit(struct sk_buff *skb, struct net_device *dev); -void t3e3_if_config(struct channel *, u32, char *, - t3e3_resp_t *, int *); +void t3e3_if_config(struct channel *, u32, char *, struct t3e3_resp *, int *); void t3e3_set_frame_type(struct channel *, u32); u32 t3e3_eeprom_read_word(struct channel *, u32); void t3e3_read_card_serial_number(struct channel *); diff --git a/drivers/staging/sbe-2t3e3/ctrl.c b/drivers/staging/sbe-2t3e3/ctrl.c index ef646c2d76ca..e0964ac9e7d7 100644 --- a/drivers/staging/sbe-2t3e3/ctrl.c +++ b/drivers/staging/sbe-2t3e3/ctrl.c @@ -287,7 +287,7 @@ static void t3e3_port_del_stats(struct channel *sc) } void t3e3_if_config(struct channel *sc, u32 cmd, char *set, - t3e3_resp_t *ret, int *rlen) + struct t3e3_resp *ret, int *rlen) { struct t3e3_param *param = (struct t3e3_param *)set; u32 *data = (u32 *)set; diff --git a/drivers/staging/sbe-2t3e3/ctrl.h b/drivers/staging/sbe-2t3e3/ctrl.h index 5845aab71ab5..41f144d75c36 100644 --- a/drivers/staging/sbe-2t3e3/ctrl.h +++ b/drivers/staging/sbe-2t3e3/ctrl.h @@ -120,12 +120,12 @@ struct t3e3_stats { }; -typedef struct t3e3_resp { +struct t3e3_resp { union { struct t3e3_param param; struct t3e3_stats stats; u32 data; } u; -} t3e3_resp_t; +}; #endif /* CTRL_H */ diff --git a/drivers/staging/sbe-2t3e3/netdev.c b/drivers/staging/sbe-2t3e3/netdev.c index b1e257bd097e..fe6c9513c9cd 100644 --- a/drivers/staging/sbe-2t3e3/netdev.c +++ b/drivers/staging/sbe-2t3e3/netdev.c @@ -26,7 +26,7 @@ static int t3e3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) struct channel *sc = dev_to_priv(dev); int cmd_2t3e3, len, rlen; struct t3e3_param param; - t3e3_resp_t resp; + struct t3e3_resp resp; void __user *data = ifr->ifr_data + sizeof(cmd_2t3e3) + sizeof(len); if (cmd == SIOCWANDEV) -- cgit v1.2.3