Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[~andy/linux] / drivers / staging / bcm / PHSDefines.h

diff --git a/drivers/staging/bcm/PHSDefines.h b/drivers/staging/bcm/PHSDefines.h
index fd7dd7f6ba8c61e58579554169b488bbc73f2075..cd78ee4ffa220bd9c54adb80e8fef38e8d434a61 100644 (file)
--- a/drivers/staging/bcm/PHSDefines.h
+++ b/drivers/staging/bcm/PHSDefines.h
@@ -37,7 +37,7 @@
 #define ERR_CLSID_MATCH_FAIL                   0x808
 #define ERR_PHSRULE_MATCH_FAIL                 0x809
 
-typedef struct _S_PHS_RULE {
+struct bcm_phs_rule {
        u8 u8PHSI;
        u8 u8PHSFLength;
        u8 u8PHSF[MAX_PHS_LENGTHS];
@@ -51,25 +51,25 @@ typedef struct _S_PHS_RULE {
        long PHSModifiedBytes;
        unsigned long PHSModifiedNumPackets;
        unsigned long PHSErrorNumPackets;
-} S_PHS_RULE;
+};
 
-typedef enum _E_CLASSIFIER_ENTRY_CONTEXT {
+enum bcm_phs_classifier_context {
        eActiveClassifierRuleContext,
        eOldClassifierRuleContext
-} E_CLASSIFIER_ENTRY_CONTEXT;
+};
 
-typedef struct _S_CLASSIFIER_ENTRY {
+struct bcm_phs_classifier_entry {
        u8  bUsed;
        u16 uiClassifierRuleId;
        u8  u8PHSI;
-       S_PHS_RULE *pstPhsRule;
+       struct bcm_phs_rule *pstPhsRule;
        u8  bUnclassifiedPHSRule;
-} S_CLASSIFIER_ENTRY;
+};
 
 struct bcm_phs_classifier_table {
        u16 uiTotalClassifiers;
-       S_CLASSIFIER_ENTRY stActivePhsRulesList[MAX_PHSRULE_PER_SF];
-       S_CLASSIFIER_ENTRY stOldPhsRulesList[MAX_PHSRULE_PER_SF];
+       struct bcm_phs_classifier_entry stActivePhsRulesList[MAX_PHSRULE_PER_SF];
+       struct bcm_phs_classifier_entry stOldPhsRulesList[MAX_PHSRULE_PER_SF];
        u16 uiOldestPhsRuleIndex;
 };