summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristina Martšenko <kristina.martsenko@gmail.com>2014-03-03 23:05:46 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-03-07 13:32:48 -0800
commiteb55b5b48088924da1b7bab494fc6c21f91ffa7b (patch)
treecb6563413ea5c53ea8a0de1f9a85f885aa046001
parentc6a297bcb169caeaf459be57cff31e9b41a6b5a4 (diff)
downloadblackbird-op-linux-eb55b5b48088924da1b7bab494fc6c21f91ffa7b.tar.gz
blackbird-op-linux-eb55b5b48088924da1b7bab494fc6c21f91ffa7b.zip
staging: sbe-2t3e3: remove t3e3_resp_t typedef
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 <kristina.martsenko@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/sbe-2t3e3/2t3e3.h3
-rw-r--r--drivers/staging/sbe-2t3e3/ctrl.c2
-rw-r--r--drivers/staging/sbe-2t3e3/ctrl.h4
-rw-r--r--drivers/staging/sbe-2t3e3/netdev.c2
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)
OpenPOWER on IntegriCloud