Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...

[cascardo/linux.git] / drivers / staging / bcm / nvm.h

diff --git a/drivers/staging/bcm/nvm.h b/drivers/staging/bcm/nvm.h
index 7aed263..e765cca 100644 (file)
--- a/drivers/staging/bcm/nvm.h
+++ b/drivers/staging/bcm/nvm.h
@@ -21,12 +21,7 @@
 #ifndef _NVM_H_
 #define _NVM_H_
 
-typedef struct _FLASH_SECTOR_INFO {
-       unsigned int uiSectorSig;
-       unsigned int uiSectorSize;
-} FLASH_SECTOR_INFO, *PFLASH_SECTOR_INFO;
-
-typedef struct _FLASH_CS_INFO {
+struct bcm_flash_cs_info {
        u32 MagicNumber;
        /* let the magic number be 0xBECE-F1A5 - F1A5 for "flas-h" */
        u32 FlashLayoutVersion;
@@ -53,12 +48,12 @@ typedef struct _FLASH_CS_INFO {
        u32 IsCDLessDeviceBootSig;
        /* MSC Timeout after reset to switch from MSC to NW Mode */
        u32 MassStorageTimeout;
-} FLASH_CS_INFO, *PFLASH_CS_INFO;
+};
 
 #define FLASH2X_TOTAL_SIZE     (64 * 1024 * 1024)
 #define DEFAULT_SECTOR_SIZE    (64 * 1024)
 
-typedef struct _FLASH_2X_CS_INFO {
+struct bcm_flash2x_cs_info {
        /* magic number as 0xBECE-F1A5 - F1A5 for "flas-h" */
        u32 MagicNumber;
        u32 FlashLayoutVersion;
@@ -118,37 +113,37 @@ typedef struct _FLASH_2X_CS_INFO {
         */
        u32 SectorAccessBitMap[FLASH2X_TOTAL_SIZE / (DEFAULT_SECTOR_SIZE * 16)];
        /* All expansions to the control data structure should add here */
-} FLASH2X_CS_INFO, *PFLASH2X_CS_INFO;
+};
 
-typedef struct _VENDOR_SECTION_INFO {
+struct bcm_vendor_section_info {
        u32 OffsetFromZeroForSectionStart;
        u32 OffsetFromZeroForSectionEnd;
        u32 AccessFlags;
        u32 Reserved[16];
-} VENDOR_SECTION_INFO, *PVENDOR_SECTION_INFO;
+};
 
-typedef struct _FLASH2X_VENDORSPECIFIC_INFO {
-       VENDOR_SECTION_INFO VendorSection[TOTAL_SECTIONS];
+struct bcm_flash2x_vendor_info {
+       struct bcm_vendor_section_info VendorSection[TOTAL_SECTIONS];
        u32 Reserved[16];
-} FLASH2X_VENDORSPECIFIC_INFO, *PFLASH2X_VENDORSPECIFIC_INFO;
+};
 
-typedef struct _DSD_HEADER {
+struct bcm_dsd_header {
        u32 DSDImageSize;
        u32 DSDImageCRC;
        u32 DSDImagePriority;
        /* We should not consider right now. Reading reserve is worthless. */
        u32 Reserved[252]; /* Resvd for DSD Header */
        u32 DSDImageMagicNumber;
-} DSD_HEADER, *PDSD_HEADER;
+};
 
-typedef struct _ISO_HEADER {
+struct bcm_iso_header {
        u32 ISOImageMagicNumber;
        u32 ISOImageSize;
        u32 ISOImageCRC;
        u32 ISOImagePriority;
        /* We should not consider right now. Reading reserve is worthless. */
        u32 Reserved[60]; /* Resvd for ISO Header extension */
-} ISO_HEADER, *PISO_HEADER;
+};
 
 #define EEPROM_BEGIN_CIS       (0)
 #define EEPROM_BEGIN_NON_CIS   (0x200)