Skip to contentSkip to conversation

staging: ft1000-pcmcia: remove FT1000_INFO typedefs

PATCH New Ondrej Zary 1 participant 1 message Jun 22, 2011 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 11/15 staging: ft1000-pcmcia: remove FT1000_INFO typedefs

Remove FT1000_INFO typedefs.

drivers/staging/ft1000/ft1000-pcmcia/ft1000.h +2 -2
@@ -320,7 +320,7 @@ struct prov_record {
     u8 *pprov_data;
 };
 
-typedef struct _FT1000_INFO {
+struct ft1000_info {
     struct net_device_stats stats;
     u16 DrvErrNum;
     u16 AsicID;
@@ -368,7 +368,7 @@ typedef struct _FT1000_INFO {
     } DSPSess;
 	struct proc_dir_entry *proc_ft1000;
 	char netdevname[IFNAMSIZ];
-} FT1000_INFO, *PFT1000_INFO;
+};
 
 typedef struct _DPRAM_BLK {
     struct list_head list;
drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c +7 -7
@@ -141,7 +141,7 @@ typedef struct _DSP_IMAGE_INFO_V6 {
 
 void card_bootload(struct net_device *dev)
 {
-	FT1000_INFO *info = (PFT1000_INFO) netdev_priv(dev);
+	struct ft1000_info *info = (struct ft1000_info *) netdev_priv(dev);
 	unsigned long flags;
 	PULONG pdata;
 	UINT size;
@@ -173,7 +173,7 @@ void card_bootload(struct net_device *dev)
 
 USHORT get_handshake(struct net_device *dev, USHORT expected_value)
 {
-	FT1000_INFO *info = (PFT1000_INFO) netdev_priv(dev);
+	struct ft1000_info *info = (struct ft1000_info *) netdev_priv(dev);
 	USHORT handshake;
 	ULONG tempx;
 	int loopcnt;
@@ -208,7 +208,7 @@ USHORT get_handshake(struct net_device *dev, USHORT expected_value)
 
 void put_handshake(struct net_device *dev, USHORT handshake_value)
 {
-	FT1000_INFO *info = (PFT1000_INFO) netdev_priv(dev);
+	struct ft1000_info *info = (struct ft1000_info *) netdev_priv(dev);
 	ULONG tempx;
 
 	if (info->AsicID == ELECTRABUZZ_ID) {
@@ -224,7 +224,7 @@ void put_handshake(struct net_device *dev, USHORT handshake_value)
 
 USHORT get_request_type(struct net_device *dev)
 {
-	FT1000_INFO *info = (PFT1000_INFO) netdev_priv(dev);
+	struct ft1000_info *info = (struct ft1000_info *) netdev_priv(dev);
 	USHORT request_type;
 	ULONG tempx;
 
@@ -243,7 +243,7 @@ USHORT get_request_type(struct net_device *dev)
 
 long get_request_value(struct net_device *dev)
 {
-	FT1000_INFO *info = (PFT1000_INFO) netdev_priv(dev);
+	struct ft1000_info *info = (struct ft1000_info *) netdev_priv(dev);
 	long value;
 	USHORT w_val;
 
@@ -272,7 +272,7 @@ long get_request_value(struct net_device *dev)
 
 void put_request_value(struct net_device *dev, long lvalue)
 {
-	FT1000_INFO *info = (PFT1000_INFO) netdev_priv(dev);
+	struct ft1000_info *info = (struct ft1000_info *) netdev_priv(dev);
 	USHORT size;
 	ULONG tempx;
 
@@ -310,7 +310,7 @@ USHORT hdr_checksum(struct pseudo_hdr *pHdr)
 
 int card_download(struct net_device *dev, const u8 *pFileStart, UINT FileLength)
 {
-	FT1000_INFO *info = (PFT1000_INFO) netdev_priv(dev);
+	struct ft1000_info *info = (struct ft1000_info *) netdev_priv(dev);
 	int Status = SUCCESS;
 	USHORT DspWordCnt = 0;
 	UINT uiState;
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +29 -29

232 lines not on this page · raw message

drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c +4 -4
@@ -53,7 +53,7 @@ int ft1000ReadProc(char *page, char **start, off_t off,
 	struct net_device *dev;
 	int len;
 	int i;
-	FT1000_INFO *info;
+	struct ft1000_info *info;
 	char *status[] =
 		{ "Idle (Disconnect)", "Searching", "Active (Connected)",
 		"Waiting for L2", "Sleep", "No Coverage", "", ""
@@ -172,7 +172,7 @@ static int ft1000NotifyProc(struct notifier_block *this, unsigned long event,
 				void *ptr)
 {
 	struct net_device *dev = ptr;
-	FT1000_INFO *info;
+	struct ft1000_info *info;
 
 	info = netdev_priv(dev);
 
@@ -193,7 +193,7 @@ static struct notifier_block ft1000_netdev_notifier = {
 
 void ft1000InitProc(struct net_device *dev)
 {
-	FT1000_INFO *info;
+	struct ft1000_info *info;
 
 	info = netdev_priv(dev);
 
@@ -206,7 +206,7 @@ void ft1000InitProc(struct net_device *dev)
 
 void ft1000CleanupProc(struct net_device *dev)
 {
-	FT1000_INFO *info;
+	struct ft1000_info *info;
 
 	info = netdev_priv(dev);
 
Signature · 1 line
Ondrej Zary