aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristina Martšenko <kristina.martsenko@gmail.com>2014-03-03 23:05:42 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-03-07 13:32:47 -0800
commit692d79e179f9a6c02de316a37c652939e7761d38 (patch)
tree41752b2cd62adeed973f1f9359fd3f9d5cb0c6de
parentStaging: sbe-2t3e3: Fix the error of (foo*) should be (foo *). (diff)
downloadlinux-dev-692d79e179f9a6c02de316a37c652939e7761d38.tar.xz
linux-dev-692d79e179f9a6c02de316a37c652939e7761d38.zip
staging: sbe-2t3e3: remove t3e3_rx_desc_t typedef
Kernel coding style does not recommend using typedefs for structures, so remove the t3e3_rx_desc_t typedef. Fix the following checkpatch warning: drivers/staging/sbe-2t3e3/2t3e3.h:616: 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.h6
-rw-r--r--drivers/staging/sbe-2t3e3/dc.c2
-rw-r--r--drivers/staging/sbe-2t3e3/intr.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/sbe-2t3e3/2t3e3.h b/drivers/staging/sbe-2t3e3/2t3e3.h
index a799975efd3f..3577fad61c5e 100644
--- a/drivers/staging/sbe-2t3e3/2t3e3.h
+++ b/drivers/staging/sbe-2t3e3/2t3e3.h
@@ -613,12 +613,12 @@
* descriptor list and data buffer
*
**********************************************************************/
-typedef struct {
+struct t3e3_rx_desc {
u32 rdes0;
u32 rdes1;
u32 rdes2;
u32 rdes3;
-} t3e3_rx_desc_t;
+};
#define SBE_2T3E3_RX_DESC_RING_SIZE 64
@@ -723,7 +723,7 @@ struct channel {
u32 interrupt_enable_mask;
/* receive chain/ring */
- t3e3_rx_desc_t *rx_ring;
+ struct t3e3_rx_desc *rx_ring;
struct sk_buff *rx_data[SBE_2T3E3_RX_DESC_RING_SIZE];
u32 rx_ring_current_read;
diff --git a/drivers/staging/sbe-2t3e3/dc.c b/drivers/staging/sbe-2t3e3/dc.c
index 42ae67c5bc33..0d60bc77f91a 100644
--- a/drivers/staging/sbe-2t3e3/dc.c
+++ b/drivers/staging/sbe-2t3e3/dc.c
@@ -316,7 +316,7 @@ static int dc_init_descriptor_list(struct channel *sc)
if (sc->ether.rx_ring == NULL)
sc->ether.rx_ring = kcalloc(SBE_2T3E3_RX_DESC_RING_SIZE,
- sizeof(t3e3_rx_desc_t), GFP_KERNEL);
+ sizeof(struct t3e3_rx_desc), GFP_KERNEL);
if (sc->ether.rx_ring == NULL)
return -ENOMEM;
diff --git a/drivers/staging/sbe-2t3e3/intr.c b/drivers/staging/sbe-2t3e3/intr.c
index efdeb7510047..a346c516bcc3 100644
--- a/drivers/staging/sbe-2t3e3/intr.c
+++ b/drivers/staging/sbe-2t3e3/intr.c
@@ -118,7 +118,7 @@ void dc_intr_rx(struct channel *sc)
{
u32 current_read;
u32 error_mask, error;
- t3e3_rx_desc_t *current_desc;
+ struct t3e3_rx_desc *current_desc;
struct sk_buff *m, *m2;
unsigned rcv_len;