From d2a392c2bd1dde3e5b8391a23ca1df7ea3d5cec5 Mon Sep 17 00:00:00 2001
From: Kevin McKinney <klmckinney1@gmail.com>
Date: Sun, 23 Sep 2012 23:07:16 -0400
Subject: Staging: bcm: Remove typedef for _stPhsRuleSI and call directly.

This patch removes typedef for _stPhsRuleSI,
changes the name of the struct to
bcm_phs_rules, and updates the comments
appropriately. In addition, any
calls to typedefs "stPhsRuleSI,
*pstPhsRuleSI, or CPhsRuleSI" are
changed to call the struct directly.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/bcm/cntrl_SignalingInterface.h b/drivers/staging/bcm/cntrl_SignalingInterface.h
index 1bf4780..f67cb6e 100644
--- a/drivers/staging/bcm/cntrl_SignalingInterface.h
+++ b/drivers/staging/bcm/cntrl_SignalingInterface.h
@@ -98,8 +98,7 @@ struct _stCPacketClassificationRuleSI {
 };
 typedef struct _stCPacketClassificationRuleSI CCPacketClassificationRuleSI, stCPacketClassificationRuleSI, *pstCPacketClassificationRuleSI;
 
-/* brief class CPhsRuleSI */
-typedef struct _stPhsRuleSI {
+struct bcm_phs_rules {
 	/* 8bit PHS Index Of The Service Flow */
 	B_UINT8 u8PHSI;
 	/* PHSF Length Of The Service Flow */
@@ -119,8 +118,7 @@ typedef struct _stPhsRuleSI {
 	/* Vendor Specific PHS param Of The Service Flow */
 	B_UINT8 u8VendorSpecificPHSParams[VENDOR_PHS_PARAM_LENGTH];
 	B_UINT8 u8Padding[2];
-} stPhsRuleSI, *pstPhsRuleSI;
-typedef stPhsRuleSI CPhsRuleSI;
+};
 
 struct bcm_convergence_types {
 	/* 8bit Phs Classfier Action Of The Service Flow */
@@ -131,8 +129,8 @@ struct bcm_convergence_types {
 	B_UINT8 u8Padding[2];
 	/* brief class cCPacketClassificationRule */
 	stCPacketClassificationRuleSI cCPacketClassificationRule;
-	/* brief class CPhsRuleSI */
-	struct _stPhsRuleSI cPhsRule;
+	/* Payload header suppression rules structure */
+	struct bcm_phs_rules cPhsRule;
 };
 
 struct bcm_connect_mgr_params {
-- 
cgit v0.10.2