staging: ft1000-pcmcia: remove PROV_RECORD typedefs

Remove PROV_RECORD typedefs.

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h b/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h
index b3aefd89f36f47531bf80e494f25fa81a85a427d..e697e9c699464d20ca7a801db4d8de6d709f65a6 100644 (file)
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h
@@ -315,10 +315,10 @@ struct dsp_init_msg {
     u8 RfCalDate[CALDATESZ];    // Rf Calibration date
 } __attribute__ ((packed));
 
-typedef struct _PROV_RECORD {
+struct prov_record {
     struct list_head list;
     u8 *pprov_data;
-} PROV_RECORD, *PPROV_RECORD;
+};
 
 typedef struct _FT1000_INFO {
     struct net_device_stats stats;

diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c
index 0a905a4299c0340f37b6cf2fb4b8073de1881c8e..3c8fcb5974843e4520e3f0455c5647ce96298641 100644 (file)
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c
@@ -321,7 +321,7 @@ int card_download(struct net_device *dev, const u8 *pFileStart, UINT FileLength)
        long word_length;
        USHORT request;
        USHORT temp;
-       PPROV_RECORD pprov_record;
+       struct prov_record *pprov_record;
        PUCHAR pbuffer;
        PDSP_FILE_HDR_5 pFileHdr5;
        PDSP_IMAGE_INFO pDspImageInfo = NULL;
@@ -890,7 +890,7 @@ int card_download(struct net_device *dev, const u8 *pFileStart, UINT FileLength)
                                                           sizeof(struct pseudo_hdr)));
                                        // link provisioning data
                                        pprov_record =
-                                               kmalloc(sizeof(PROV_RECORD),
+                                               kmalloc(sizeof(struct prov_record),
                                                        GFP_ATOMIC);
                                        if (pprov_record) {
                                                pprov_record->pprov_data =

diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
index 949c155139046bcb9cd08c8e933f80eaf185c20b..d33f7479e784e37192205481438ef889f87221f7 100644 (file)
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
@@ -421,7 +421,7 @@ static int ft1000_reset_card(struct net_device *dev)
        u16 tempword;
        int i;
        unsigned long flags;
-       PPROV_RECORD ptr;
+       struct prov_record *ptr;
 
        DEBUG(1, "ft1000_hw:ft1000_reset_card called.....\n");
 
@@ -436,7 +436,7 @@ static int ft1000_reset_card(struct net_device *dev)
        while (list_empty(&info->prov_list) == 0) {
                DEBUG(0,
                          "ft1000_hw:ft1000_reset_card:deleting provisioning record\n");
-               ptr = list_entry(info->prov_list.next, PROV_RECORD, list);
+               ptr = list_entry(info->prov_list.next, struct prov_record, list);
                list_del(&ptr->list);
                kfree(ptr->pprov_data);
                kfree(ptr);
@@ -1020,7 +1020,7 @@ void ft1000_proc_drvmsg(struct net_device *dev)
        struct drv_msg *pdrvmsg;
        u16 len;
        u16 i;
-       PPROV_RECORD ptr;
+       struct prov_record *ptr;
        struct pseudo_hdr *ppseudo_hdr;
        PUSHORT pmsg;
        struct timeval tv;
@@ -1061,7 +1061,7 @@ void ft1000_proc_drvmsg(struct net_device *dev)
                                }
                                ptr =
                                        list_entry(info->prov_list.next,
-                                                  PROV_RECORD, list);
+                                                  struct prov_record, list);
                                len = *(u16 *) ptr->pprov_data;
                                len = htons(len);
 
@@ -2095,7 +2095,7 @@ static irqreturn_t ft1000_interrupt(int irq, void *dev_id)
 void stop_ft1000_card(struct net_device *dev)
 {
        FT1000_INFO *info = netdev_priv(dev);
-       PPROV_RECORD ptr;
+       struct prov_record *ptr;
 //     int cnt;
 
        DEBUG(0, "ft1000_hw: stop_ft1000_card()\n");
@@ -2107,7 +2107,7 @@ void stop_ft1000_card(struct net_device *dev)
 
        // Make sure we free any memory reserve for provisioning
        while (list_empty(&info->prov_list) == 0) {
-               ptr = list_entry(info->prov_list.next, PROV_RECORD, list);
+               ptr = list_entry(info->prov_list.next, struct prov_record, list);
                list_del(&ptr->list);
                kfree(ptr->pprov_data);
                kfree(ptr);