diff options
author | Marek Belisko <marek.belisko@open-nandra.com> | 2010-10-16 16:37:27 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-19 13:08:51 -0400 |
commit | 1a88a068710910aa9a303bc061f405b0768fef80 (patch) | |
tree | 7852bd299a74c025e8212e53f56b802fd32c6c2d /drivers/staging/ft1000 | |
parent | 8e99c33d08ec605133693a9b61f22c0495fc2866 (diff) |
staging: ft1000: Remove FT1000_INFO typedef usage.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/ft1000')
-rw-r--r-- | drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c | 28 | ||||
-rw-r--r-- | drivers/staging/ft1000/ft1000-usb/ft1000_download.c | 16 | ||||
-rw-r--r-- | drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 42 | ||||
-rw-r--r-- | drivers/staging/ft1000/ft1000-usb/ft1000_proc.c | 14 | ||||
-rw-r--r-- | drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 8 | ||||
-rw-r--r-- | drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 6 |
6 files changed, 57 insertions, 57 deletions
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c b/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c index 36d8e51f6e8..87a6487531c 100644 --- a/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c | |||
@@ -95,7 +95,7 @@ static struct file_operations ft1000fops = | |||
95 | //--------------------------------------------------------------------------- | 95 | //--------------------------------------------------------------------------- |
96 | static int exec_mknod (void *pdata) | 96 | static int exec_mknod (void *pdata) |
97 | { | 97 | { |
98 | PFT1000_INFO info; | 98 | struct ft1000_info *info; |
99 | char mjnum[4]; | 99 | char mjnum[4]; |
100 | char minornum[4]; | 100 | char minornum[4]; |
101 | char temp[32]; | 101 | char temp[32]; |
@@ -137,13 +137,13 @@ static int exec_mknod (void *pdata) | |||
137 | static int rm_mknod (void *pdata) | 137 | static int rm_mknod (void *pdata) |
138 | { | 138 | { |
139 | 139 | ||
140 | PFT1000_INFO info; | 140 | struct ft1000_info *info; |
141 | //char *argv[4]={"rm", "-f", "/dev/FT1000", NULL}; | 141 | //char *argv[4]={"rm", "-f", "/dev/FT1000", NULL}; |
142 | int retcode; | 142 | int retcode; |
143 | char temp[32]; | 143 | char temp[32]; |
144 | char *argv[]={"rm", "-f", temp, NULL}; | 144 | char *argv[]={"rm", "-f", temp, NULL}; |
145 | 145 | ||
146 | info = (PFT1000_INFO)pdata; | 146 | info = (struct ft1000_info *)pdata; |
147 | DEBUG("ft1000_chdev:rm_mknod is called for device %s\n", info->DeviceName); | 147 | DEBUG("ft1000_chdev:rm_mknod is called for device %s\n", info->DeviceName); |
148 | sprintf(temp, "%s%s", "/dev/", info->DeviceName) ; | 148 | sprintf(temp, "%s%s", "/dev/", info->DeviceName) ; |
149 | 149 | ||
@@ -235,7 +235,7 @@ void ft1000_free_buffer(struct dpram_blk *pdpram_blk, struct list_head *plist) | |||
235 | //--------------------------------------------------------------------------- | 235 | //--------------------------------------------------------------------------- |
236 | int ft1000_CreateDevice(struct ft1000_device *dev) | 236 | int ft1000_CreateDevice(struct ft1000_device *dev) |
237 | { | 237 | { |
238 | PFT1000_INFO info = netdev_priv(dev->net); | 238 | struct ft1000_info *info = netdev_priv(dev->net); |
239 | int result; | 239 | int result; |
240 | int i; | 240 | int i; |
241 | pid_t pid; | 241 | pid_t pid; |
@@ -349,7 +349,7 @@ int ft1000_CreateDevice(struct ft1000_device *dev) | |||
349 | //--------------------------------------------------------------------------- | 349 | //--------------------------------------------------------------------------- |
350 | void ft1000_DestroyDevice(struct net_device *dev) | 350 | void ft1000_DestroyDevice(struct net_device *dev) |
351 | { | 351 | { |
352 | PFT1000_INFO info = netdev_priv(dev); | 352 | struct ft1000_info *info = netdev_priv(dev); |
353 | int result = 0; | 353 | int result = 0; |
354 | pid_t pid; | 354 | pid_t pid; |
355 | int i; | 355 | int i; |
@@ -412,7 +412,7 @@ void ft1000_DestroyDevice(struct net_device *dev) | |||
412 | //--------------------------------------------------------------------------- | 412 | //--------------------------------------------------------------------------- |
413 | static int ft1000_ChOpen (struct inode *Inode, struct file *File) | 413 | static int ft1000_ChOpen (struct inode *Inode, struct file *File) |
414 | { | 414 | { |
415 | PFT1000_INFO info; | 415 | struct ft1000_info *info; |
416 | int i,num; | 416 | int i,num; |
417 | 417 | ||
418 | DEBUG("ft1000_ChOpen called\n"); | 418 | DEBUG("ft1000_ChOpen called\n"); |
@@ -423,8 +423,8 @@ static int ft1000_ChOpen (struct inode *Inode, struct file *File) | |||
423 | DEBUG("pdevobj[%d]=%p\n", i, pdevobj[i]); //aelias [+] reason: down | 423 | DEBUG("pdevobj[%d]=%p\n", i, pdevobj[i]); //aelias [+] reason: down |
424 | 424 | ||
425 | if ( pdevobj[num] != NULL ) | 425 | if ( pdevobj[num] != NULL ) |
426 | //info = (PFT1000_INFO)(pdevobj[num]->net->priv); | 426 | //info = (struct ft1000_info *)(pdevobj[num]->net->priv); |
427 | info = (FT1000_INFO *) netdev_priv (pdevobj[num]->net); | 427 | info = (struct ft1000_info *)netdev_priv(pdevobj[num]->net); |
428 | else | 428 | else |
429 | { | 429 | { |
430 | DEBUG("ft1000_ChOpen: can not find device object %d\n", num); | 430 | DEBUG("ft1000_ChOpen: can not find device object %d\n", num); |
@@ -480,7 +480,7 @@ static int ft1000_ChOpen (struct inode *Inode, struct file *File) | |||
480 | static unsigned int ft1000_ChPoll(struct file *file, poll_table *wait) | 480 | static unsigned int ft1000_ChPoll(struct file *file, poll_table *wait) |
481 | { | 481 | { |
482 | struct net_device *dev = file->private_data; | 482 | struct net_device *dev = file->private_data; |
483 | PFT1000_INFO info; | 483 | struct ft1000_info *info; |
484 | int i; | 484 | int i; |
485 | 485 | ||
486 | //DEBUG("ft1000_ChPoll called\n"); | 486 | //DEBUG("ft1000_ChPoll called\n"); |
@@ -489,7 +489,7 @@ static unsigned int ft1000_ChPoll(struct file *file, poll_table *wait) | |||
489 | return (-EBADF); | 489 | return (-EBADF); |
490 | } | 490 | } |
491 | 491 | ||
492 | info = (FT1000_INFO *) netdev_priv (dev); | 492 | info = (struct ft1000_info *) netdev_priv(dev); |
493 | 493 | ||
494 | // Search for matching file object | 494 | // Search for matching file object |
495 | for (i=0; i<MAX_NUM_APP; i++) { | 495 | for (i=0; i<MAX_NUM_APP; i++) { |
@@ -531,7 +531,7 @@ static long ft1000_ChIoctl (struct file *File, unsigned int Command, | |||
531 | { | 531 | { |
532 | void __user *argp = (void __user *)Argument; | 532 | void __user *argp = (void __user *)Argument; |
533 | struct net_device *dev; | 533 | struct net_device *dev; |
534 | PFT1000_INFO info; | 534 | struct ft1000_info *info; |
535 | struct ft1000_device *ft1000dev; | 535 | struct ft1000_device *ft1000dev; |
536 | int result=0; | 536 | int result=0; |
537 | int cmd; | 537 | int cmd; |
@@ -561,7 +561,7 @@ static long ft1000_ChIoctl (struct file *File, unsigned int Command, | |||
561 | //DEBUG("FT1000:ft1000_ChIoctl:Command = 0x%x Argument = 0x%8x\n", Command, (u32)Argument); | 561 | //DEBUG("FT1000:ft1000_ChIoctl:Command = 0x%x Argument = 0x%8x\n", Command, (u32)Argument); |
562 | 562 | ||
563 | dev = File->private_data; | 563 | dev = File->private_data; |
564 | info = (FT1000_INFO *) netdev_priv (dev); | 564 | info = (struct ft1000_info *) netdev_priv(dev); |
565 | ft1000dev = info->pFt1000Dev; | 565 | ft1000dev = info->pFt1000Dev; |
566 | cmd = _IOC_NR(Command); | 566 | cmd = _IOC_NR(Command); |
567 | //DEBUG("FT1000:ft1000_ChIoctl:cmd = 0x%x\n", cmd); | 567 | //DEBUG("FT1000:ft1000_ChIoctl:cmd = 0x%x\n", cmd); |
@@ -893,7 +893,7 @@ static long ft1000_ChIoctl (struct file *File, unsigned int Command, | |||
893 | //--------------------------------------------------------------------------- | 893 | //--------------------------------------------------------------------------- |
894 | static int ft1000_ChRelease (struct inode *Inode, struct file *File) | 894 | static int ft1000_ChRelease (struct inode *Inode, struct file *File) |
895 | { | 895 | { |
896 | PFT1000_INFO info; | 896 | struct ft1000_info *info; |
897 | struct net_device *dev; | 897 | struct net_device *dev; |
898 | int i; | 898 | int i; |
899 | struct dpram_blk *pdpram_blk; | 899 | struct dpram_blk *pdpram_blk; |
@@ -901,7 +901,7 @@ static int ft1000_ChRelease (struct inode *Inode, struct file *File) | |||
901 | DEBUG("ft1000_ChRelease called\n"); | 901 | DEBUG("ft1000_ChRelease called\n"); |
902 | 902 | ||
903 | dev = File->private_data; | 903 | dev = File->private_data; |
904 | info = (FT1000_INFO *) netdev_priv (dev); | 904 | info = (struct ft1000_info *) netdev_priv(dev); |
905 | 905 | ||
906 | if (ft1000_flarion_cnt == 0) { | 906 | if (ft1000_flarion_cnt == 0) { |
907 | info->appcnt--; | 907 | info->appcnt--; |
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_download.c b/drivers/staging/ft1000/ft1000-usb/ft1000_download.c index ee32f40b359..4dd456fbab9 100644 --- a/drivers/staging/ft1000/ft1000-usb/ft1000_download.c +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_download.c | |||
@@ -205,7 +205,7 @@ static USHORT get_handshake(struct ft1000_device *ft1000dev, USHORT expected_val | |||
205 | USHORT handshake; | 205 | USHORT handshake; |
206 | int loopcnt; | 206 | int loopcnt; |
207 | ULONG status=0; | 207 | ULONG status=0; |
208 | PFT1000_INFO pft1000info = netdev_priv(ft1000dev->net); | 208 | struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net); |
209 | 209 | ||
210 | loopcnt = 0; | 210 | loopcnt = 0; |
211 | while (loopcnt < 100) | 211 | while (loopcnt < 100) |
@@ -294,7 +294,7 @@ static USHORT get_handshake_usb(struct ft1000_device *ft1000dev, USHORT expected | |||
294 | USHORT temp; | 294 | USHORT temp; |
295 | ULONG status=0; | 295 | ULONG status=0; |
296 | 296 | ||
297 | PFT1000_INFO pft1000info = netdev_priv(ft1000dev->net); | 297 | struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net); |
298 | loopcnt = 0; | 298 | loopcnt = 0; |
299 | handshake = 0; | 299 | handshake = 0; |
300 | while (loopcnt < 100) | 300 | while (loopcnt < 100) |
@@ -352,7 +352,7 @@ static USHORT get_request_type(struct ft1000_device *ft1000dev) | |||
352 | ULONG status; | 352 | ULONG status; |
353 | USHORT tempword; | 353 | USHORT tempword; |
354 | ULONG tempx; | 354 | ULONG tempx; |
355 | PFT1000_INFO pft1000info = netdev_priv(ft1000dev->net); | 355 | struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net); |
356 | 356 | ||
357 | if ( pft1000info->bootmode == 1) | 357 | if ( pft1000info->bootmode == 1) |
358 | { | 358 | { |
@@ -380,7 +380,7 @@ static USHORT get_request_type_usb(struct ft1000_device *ft1000dev) | |||
380 | ULONG status; | 380 | ULONG status; |
381 | USHORT tempword; | 381 | USHORT tempword; |
382 | ULONG tempx; | 382 | ULONG tempx; |
383 | PFT1000_INFO pft1000info = netdev_priv(ft1000dev->net); | 383 | struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net); |
384 | if ( pft1000info->bootmode == 1) | 384 | if ( pft1000info->bootmode == 1) |
385 | { | 385 | { |
386 | status = fix_ft1000_read_dpram32 (ft1000dev, DWNLD_MAG1_TYPE_LOC, (PUCHAR)&tempx); | 386 | status = fix_ft1000_read_dpram32 (ft1000dev, DWNLD_MAG1_TYPE_LOC, (PUCHAR)&tempx); |
@@ -423,7 +423,7 @@ static long get_request_value(struct ft1000_device *ft1000dev) | |||
423 | ULONG value; | 423 | ULONG value; |
424 | USHORT tempword; | 424 | USHORT tempword; |
425 | ULONG status; | 425 | ULONG status; |
426 | PFT1000_INFO pft1000info = netdev_priv(ft1000dev->net); | 426 | struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net); |
427 | 427 | ||
428 | 428 | ||
429 | if ( pft1000info->bootmode == 1) | 429 | if ( pft1000info->bootmode == 1) |
@@ -452,7 +452,7 @@ static long get_request_value_usb(struct ft1000_device *ft1000dev) | |||
452 | ULONG value; | 452 | ULONG value; |
453 | USHORT tempword; | 453 | USHORT tempword; |
454 | ULONG status; | 454 | ULONG status; |
455 | PFT1000_INFO pft1000info = netdev_priv(ft1000dev->net); | 455 | struct ft1000_info * pft1000info = netdev_priv(ft1000dev->net); |
456 | 456 | ||
457 | if (pft1000info->usbboot == 2) { | 457 | if (pft1000info->usbboot == 2) { |
458 | value = pft1000info->tempbuf[4]; | 458 | value = pft1000info->tempbuf[4]; |
@@ -556,7 +556,7 @@ static ULONG write_blk (struct ft1000_device *ft1000dev, USHORT **pUsFile, UCHAR | |||
556 | USHORT tempword; | 556 | USHORT tempword; |
557 | USHORT tempbuffer[64]; | 557 | USHORT tempbuffer[64]; |
558 | USHORT resultbuffer[64]; | 558 | USHORT resultbuffer[64]; |
559 | PFT1000_INFO pft1000info = netdev_priv(ft1000dev->net); | 559 | struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net); |
560 | 560 | ||
561 | //DEBUG("FT1000:download:start word_length = %d\n",(int)word_length); | 561 | //DEBUG("FT1000:download:start word_length = %d\n",(int)word_length); |
562 | dpram = (USHORT)DWNLD_MAG1_PS_HDR_LOC; | 562 | dpram = (USHORT)DWNLD_MAG1_PS_HDR_LOC; |
@@ -801,7 +801,7 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, ULONG FileLe | |||
801 | USHORT dpram = 0; | 801 | USHORT dpram = 0; |
802 | PUCHAR pbuffer; | 802 | PUCHAR pbuffer; |
803 | struct prov_record *pprov_record; | 803 | struct prov_record *pprov_record; |
804 | FT1000_INFO *pft1000info = netdev_priv(ft1000dev->net); | 804 | struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net); |
805 | 805 | ||
806 | DEBUG("Entered scram_dnldr...\n"); | 806 | DEBUG("Entered scram_dnldr...\n"); |
807 | 807 | ||
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c index e160e606cb0..5b89ee2a297 100644 --- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | |||
@@ -32,7 +32,7 @@ | |||
32 | //#define JDEBUG | 32 | //#define JDEBUG |
33 | 33 | ||
34 | static int ft1000_reset(struct net_device *ft1000dev); | 34 | static int ft1000_reset(struct net_device *ft1000dev); |
35 | static int ft1000_submit_rx_urb(PFT1000_INFO info); | 35 | static int ft1000_submit_rx_urb(struct ft1000_info *info); |
36 | static int ft1000_start_xmit(struct sk_buff *skb, struct net_device *dev); | 36 | static int ft1000_start_xmit(struct sk_buff *skb, struct net_device *dev); |
37 | static int ft1000_open (struct net_device *dev); | 37 | static int ft1000_open (struct net_device *dev); |
38 | static struct net_device_stats *ft1000_netdev_stats(struct net_device *dev); | 38 | static struct net_device_stats *ft1000_netdev_stats(struct net_device *dev); |
@@ -623,7 +623,7 @@ int dsp_reload(struct ft1000_device *ft1000dev) | |||
623 | USHORT tempword; | 623 | USHORT tempword; |
624 | ULONG templong; | 624 | ULONG templong; |
625 | 625 | ||
626 | PFT1000_INFO pft1000info; | 626 | struct ft1000_info *pft1000info; |
627 | 627 | ||
628 | pft1000info = netdev_priv(ft1000dev->net); | 628 | pft1000info = netdev_priv(ft1000dev->net); |
629 | 629 | ||
@@ -677,7 +677,7 @@ int dsp_reload(struct ft1000_device *ft1000dev) | |||
677 | //--------------------------------------------------------------------------- | 677 | //--------------------------------------------------------------------------- |
678 | static void ft1000_reset_asic (struct net_device *dev) | 678 | static void ft1000_reset_asic (struct net_device *dev) |
679 | { | 679 | { |
680 | FT1000_INFO *info = netdev_priv(dev); | 680 | struct ft1000_info *info = netdev_priv(dev); |
681 | struct ft1000_device *ft1000dev = info->pFt1000Dev; | 681 | struct ft1000_device *ft1000dev = info->pFt1000Dev; |
682 | u16 tempword; | 682 | u16 tempword; |
683 | 683 | ||
@@ -717,7 +717,7 @@ static void ft1000_reset_asic (struct net_device *dev) | |||
717 | //--------------------------------------------------------------------------- | 717 | //--------------------------------------------------------------------------- |
718 | static int ft1000_reset_card (struct net_device *dev) | 718 | static int ft1000_reset_card (struct net_device *dev) |
719 | { | 719 | { |
720 | FT1000_INFO *info = netdev_priv(dev); | 720 | struct ft1000_info *info = netdev_priv(dev); |
721 | struct ft1000_device *ft1000dev = info->pFt1000Dev; | 721 | struct ft1000_device *ft1000dev = info->pFt1000Dev; |
722 | u16 tempword; | 722 | u16 tempword; |
723 | struct prov_record *ptr; | 723 | struct prov_record *ptr; |
@@ -795,7 +795,7 @@ static const struct net_device_ops ftnet_ops = | |||
795 | u16 init_ft1000_netdev(struct ft1000_device *ft1000dev) | 795 | u16 init_ft1000_netdev(struct ft1000_device *ft1000dev) |
796 | { | 796 | { |
797 | struct net_device *netdev; | 797 | struct net_device *netdev; |
798 | FT1000_INFO *pInfo = NULL; | 798 | struct ft1000_info *pInfo = NULL; |
799 | struct dpram_blk *pdpram_blk; | 799 | struct dpram_blk *pdpram_blk; |
800 | int i, ret_val; | 800 | int i, ret_val; |
801 | struct list_head *cur, *tmp; | 801 | struct list_head *cur, *tmp; |
@@ -806,18 +806,18 @@ u16 init_ft1000_netdev(struct ft1000_device *ft1000dev) | |||
806 | DEBUG("Enter init_ft1000_netdev...\n"); | 806 | DEBUG("Enter init_ft1000_netdev...\n"); |
807 | 807 | ||
808 | 808 | ||
809 | netdev = alloc_etherdev( sizeof(FT1000_INFO)); | 809 | netdev = alloc_etherdev(sizeof(struct ft1000_info)); |
810 | if (!netdev ) | 810 | if (!netdev ) |
811 | { | 811 | { |
812 | DEBUG("init_ft1000_netdev: can not allocate network device\n"); | 812 | DEBUG("init_ft1000_netdev: can not allocate network device\n"); |
813 | return -ENOMEM; | 813 | return -ENOMEM; |
814 | } | 814 | } |
815 | 815 | ||
816 | pInfo = (FT1000_INFO *) netdev_priv (netdev); | 816 | pInfo = (struct ft1000_info *) netdev_priv(netdev); |
817 | 817 | ||
818 | //DEBUG("init_ft1000_netdev: gFt1000Info=%x, netdev=%x, ft1000dev=%x\n", gFt1000Info, netdev, ft1000dev); | 818 | //DEBUG("init_ft1000_netdev: gFt1000Info=%x, netdev=%x, ft1000dev=%x\n", gFt1000Info, netdev, ft1000dev); |
819 | 819 | ||
820 | memset (pInfo, 0, sizeof(FT1000_INFO)); | 820 | memset(pInfo, 0, sizeof(struct ft1000_info)); |
821 | 821 | ||
822 | dev_alloc_name(netdev, netdev->name); | 822 | dev_alloc_name(netdev, netdev->name); |
823 | 823 | ||
@@ -959,7 +959,7 @@ err_net: | |||
959 | int reg_ft1000_netdev(struct ft1000_device *ft1000dev, struct usb_interface *intf) | 959 | int reg_ft1000_netdev(struct ft1000_device *ft1000dev, struct usb_interface *intf) |
960 | { | 960 | { |
961 | struct net_device *netdev; | 961 | struct net_device *netdev; |
962 | FT1000_INFO *pInfo; | 962 | struct ft1000_info *pInfo; |
963 | int rc; | 963 | int rc; |
964 | 964 | ||
965 | netdev = ft1000dev->net; | 965 | netdev = ft1000dev->net; |
@@ -1169,7 +1169,7 @@ static inline u16 ft1000_read_fifo_len (struct net_device *dev) | |||
1169 | u16 temp; | 1169 | u16 temp; |
1170 | u16 ret; | 1170 | u16 ret; |
1171 | 1171 | ||
1172 | FT1000_INFO *info = (FT1000_INFO *) netdev_priv (dev); | 1172 | struct ft1000_info *info = (struct ft1000_info *) netdev_priv(dev); |
1173 | struct ft1000_device *ft1000dev = info->pFt1000Dev; | 1173 | struct ft1000_device *ft1000dev = info->pFt1000Dev; |
1174 | // DEBUG("ft1000_read_fifo_len: enter ft1000dev %x\n", ft1000dev); //aelias [-] reason: warning: format ???%x??? expects type ???unsigned int???, but argument 2 has type ???struct ft1000_device *??? | 1174 | // DEBUG("ft1000_read_fifo_len: enter ft1000dev %x\n", ft1000dev); //aelias [-] reason: warning: format ???%x??? expects type ???unsigned int???, but argument 2 has type ???struct ft1000_device *??? |
1175 | DEBUG("ft1000_read_fifo_len: enter ft1000dev %p\n", ft1000dev); //aelias [+] reason: up | 1175 | DEBUG("ft1000_read_fifo_len: enter ft1000dev %p\n", ft1000dev); //aelias [+] reason: up |
@@ -1215,7 +1215,7 @@ static inline u16 ft1000_read_fifo_len (struct net_device *dev) | |||
1215 | //--------------------------------------------------------------------------- | 1215 | //--------------------------------------------------------------------------- |
1216 | static int ft1000_copy_down_pkt (struct net_device *netdev, u8 *packet, u16 len) | 1216 | static int ft1000_copy_down_pkt (struct net_device *netdev, u8 *packet, u16 len) |
1217 | { | 1217 | { |
1218 | FT1000_INFO *pInfo = netdev_priv(netdev); | 1218 | struct ft1000_info *pInfo = netdev_priv(netdev); |
1219 | struct ft1000_device *pFt1000Dev = pInfo->pFt1000Dev; | 1219 | struct ft1000_device *pFt1000Dev = pInfo->pFt1000Dev; |
1220 | 1220 | ||
1221 | 1221 | ||
@@ -1320,7 +1320,7 @@ static int ft1000_copy_down_pkt (struct net_device *netdev, u8 *packet, u16 len) | |||
1320 | //--------------------------------------------------------------------------- | 1320 | //--------------------------------------------------------------------------- |
1321 | static int ft1000_start_xmit(struct sk_buff *skb, struct net_device *dev) | 1321 | static int ft1000_start_xmit(struct sk_buff *skb, struct net_device *dev) |
1322 | { | 1322 | { |
1323 | FT1000_INFO *pInfo = netdev_priv(dev); | 1323 | struct ft1000_info *pInfo = netdev_priv(dev); |
1324 | struct ft1000_device *pFt1000Dev= pInfo->pFt1000Dev; | 1324 | struct ft1000_device *pFt1000Dev= pInfo->pFt1000Dev; |
1325 | u8 *pdata; | 1325 | u8 *pdata; |
1326 | int maxlen, pipe; | 1326 | int maxlen, pipe; |
@@ -1396,7 +1396,7 @@ static int ft1000_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1396 | //--------------------------------------------------------------------------- | 1396 | //--------------------------------------------------------------------------- |
1397 | static int ft1000_copy_up_pkt (struct urb *urb) | 1397 | static int ft1000_copy_up_pkt (struct urb *urb) |
1398 | { | 1398 | { |
1399 | PFT1000_INFO info = urb->context; | 1399 | struct ft1000_info *info = urb->context; |
1400 | struct ft1000_device *ft1000dev = info->pFt1000Dev; | 1400 | struct ft1000_device *ft1000dev = info->pFt1000Dev; |
1401 | struct net_device *net = ft1000dev->net; | 1401 | struct net_device *net = ft1000dev->net; |
1402 | 1402 | ||
@@ -1510,7 +1510,7 @@ static int ft1000_copy_up_pkt (struct urb *urb) | |||
1510 | // SUCCESS | 1510 | // SUCCESS |
1511 | // | 1511 | // |
1512 | //--------------------------------------------------------------------------- | 1512 | //--------------------------------------------------------------------------- |
1513 | static int ft1000_submit_rx_urb(PFT1000_INFO info) | 1513 | static int ft1000_submit_rx_urb(struct ft1000_info *info) |
1514 | { | 1514 | { |
1515 | int result; | 1515 | int result; |
1516 | struct ft1000_device *pFt1000Dev = info->pFt1000Dev; | 1516 | struct ft1000_device *pFt1000Dev = info->pFt1000Dev; |
@@ -1560,7 +1560,7 @@ static int ft1000_submit_rx_urb(PFT1000_INFO info) | |||
1560 | //--------------------------------------------------------------------------- | 1560 | //--------------------------------------------------------------------------- |
1561 | static int ft1000_open (struct net_device *dev) | 1561 | static int ft1000_open (struct net_device *dev) |
1562 | { | 1562 | { |
1563 | FT1000_INFO *pInfo = (FT1000_INFO *)netdev_priv(dev); | 1563 | struct ft1000_info *pInfo = (struct ft1000_info *)netdev_priv(dev); |
1564 | struct timeval tv; //mbelian | 1564 | struct timeval tv; //mbelian |
1565 | 1565 | ||
1566 | DEBUG("ft1000_open is called for card %d\n", pInfo->CardNumber); | 1566 | DEBUG("ft1000_open is called for card %d\n", pInfo->CardNumber); |
@@ -1599,7 +1599,7 @@ static int ft1000_open (struct net_device *dev) | |||
1599 | //--------------------------------------------------------------------------- | 1599 | //--------------------------------------------------------------------------- |
1600 | int ft1000_close(struct net_device *net) | 1600 | int ft1000_close(struct net_device *net) |
1601 | { | 1601 | { |
1602 | FT1000_INFO *pInfo = (FT1000_INFO *) netdev_priv (net); | 1602 | struct ft1000_info *pInfo = (struct ft1000_info *) netdev_priv(net); |
1603 | struct ft1000_device *ft1000dev = pInfo->pFt1000Dev; | 1603 | struct ft1000_device *ft1000dev = pInfo->pFt1000Dev; |
1604 | 1604 | ||
1605 | //DEBUG ("ft1000_close: netdev->refcnt=%d\n", net->refcnt); | 1605 | //DEBUG ("ft1000_close: netdev->refcnt=%d\n", net->refcnt); |
@@ -1622,7 +1622,7 @@ int ft1000_close(struct net_device *net) | |||
1622 | 1622 | ||
1623 | static struct net_device_stats *ft1000_netdev_stats(struct net_device *dev) | 1623 | static struct net_device_stats *ft1000_netdev_stats(struct net_device *dev) |
1624 | { | 1624 | { |
1625 | FT1000_INFO *info = (FT1000_INFO *) netdev_priv (dev); | 1625 | struct ft1000_info *info = (struct ft1000_info *) netdev_priv(dev); |
1626 | 1626 | ||
1627 | return &(info->stats); //mbelian | 1627 | return &(info->stats); //mbelian |
1628 | } | 1628 | } |
@@ -1648,7 +1648,7 @@ Jim | |||
1648 | static int ft1000_chkcard (struct ft1000_device *dev) { | 1648 | static int ft1000_chkcard (struct ft1000_device *dev) { |
1649 | u16 tempword; | 1649 | u16 tempword; |
1650 | u16 status; | 1650 | u16 status; |
1651 | FT1000_INFO *info = (FT1000_INFO *) netdev_priv (dev->net); | 1651 | struct ft1000_info *info = (struct ft1000_info *) netdev_priv(dev->net); |
1652 | 1652 | ||
1653 | if (info->fCondResetPend) | 1653 | if (info->fCondResetPend) |
1654 | { | 1654 | { |
@@ -1748,7 +1748,7 @@ static BOOLEAN ft1000_receive_cmd (struct ft1000_device *dev, u16 *pbuffer, int | |||
1748 | static int ft1000_dsp_prov(void *arg) | 1748 | static int ft1000_dsp_prov(void *arg) |
1749 | { | 1749 | { |
1750 | struct ft1000_device *dev = (struct ft1000_device *)arg; | 1750 | struct ft1000_device *dev = (struct ft1000_device *)arg; |
1751 | FT1000_INFO *info = (FT1000_INFO *) netdev_priv (dev->net); | 1751 | struct ft1000_info *info = (struct ft1000_info *) netdev_priv(dev->net); |
1752 | u16 tempword; | 1752 | u16 tempword; |
1753 | u16 len; | 1753 | u16 len; |
1754 | u16 i=0; | 1754 | u16 i=0; |
@@ -1831,7 +1831,7 @@ static int ft1000_dsp_prov(void *arg) | |||
1831 | 1831 | ||
1832 | 1832 | ||
1833 | static int ft1000_proc_drvmsg (struct ft1000_device *dev, u16 size) { | 1833 | static int ft1000_proc_drvmsg (struct ft1000_device *dev, u16 size) { |
1834 | FT1000_INFO *info = (FT1000_INFO *) netdev_priv (dev->net); | 1834 | struct ft1000_info *info = (struct ft1000_info *) netdev_priv(dev->net); |
1835 | u16 msgtype; | 1835 | u16 msgtype; |
1836 | u16 tempword; | 1836 | u16 tempword; |
1837 | struct media_msg *pmediamsg; | 1837 | struct media_msg *pmediamsg; |
@@ -2114,7 +2114,7 @@ out: | |||
2114 | int ft1000_poll(void* dev_id) { | 2114 | int ft1000_poll(void* dev_id) { |
2115 | 2115 | ||
2116 | struct ft1000_device *dev = (struct ft1000_device *)dev_id; | 2116 | struct ft1000_device *dev = (struct ft1000_device *)dev_id; |
2117 | FT1000_INFO *info = (FT1000_INFO *) netdev_priv (dev->net); | 2117 | struct ft1000_info *info = (struct ft1000_info *) netdev_priv(dev->net); |
2118 | 2118 | ||
2119 | u16 tempword; | 2119 | u16 tempword; |
2120 | u16 status; | 2120 | u16 status; |
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c b/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c index d1ef396c13d..36cdd588fa9 100644 --- a/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c | |||
@@ -52,7 +52,7 @@ ft1000ReadProc (char *page, char **start, off_t off, int count, int *eof, | |||
52 | unsigned short ledStat; | 52 | unsigned short ledStat; |
53 | unsigned short conStat; | 53 | unsigned short conStat; |
54 | 54 | ||
55 | FT1000_INFO *info; | 55 | struct ft1000_info *info; |
56 | 56 | ||
57 | char *status[] = { "Idle (Disconnect)", "Searching", "Active (Connected)", | 57 | char *status[] = { "Idle (Disconnect)", "Searching", "Active (Connected)", |
58 | "Waiting for L2", "Sleep", "No Coverage", "", "" | 58 | "Waiting for L2", "Sleep", "No Coverage", "", "" |
@@ -65,7 +65,7 @@ ft1000ReadProc (char *page, char **start, off_t off, int count, int *eof, | |||
65 | time_t delta; | 65 | time_t delta; |
66 | 66 | ||
67 | dev = (struct net_device *) data; | 67 | dev = (struct net_device *) data; |
68 | info = (FT1000_INFO *) netdev_priv (dev); | 68 | info = (struct ft1000_info *) netdev_priv(dev); |
69 | 69 | ||
70 | if (off > 0) | 70 | if (off > 0) |
71 | { | 71 | { |
@@ -169,10 +169,10 @@ static int | |||
169 | ft1000NotifyProc (struct notifier_block *this, unsigned long event, void *ptr) | 169 | ft1000NotifyProc (struct notifier_block *this, unsigned long event, void *ptr) |
170 | { | 170 | { |
171 | struct net_device *dev = ptr; | 171 | struct net_device *dev = ptr; |
172 | FT1000_INFO *info; | 172 | struct ft1000_info *info; |
173 | struct proc_dir_entry *ft1000_proc_file; | 173 | struct proc_dir_entry *ft1000_proc_file; |
174 | 174 | ||
175 | info = (FT1000_INFO *) netdev_priv (dev); | 175 | info = (struct ft1000_info *) netdev_priv(dev); |
176 | 176 | ||
177 | 177 | ||
178 | switch (event) | 178 | switch (event) |
@@ -196,9 +196,9 @@ static struct notifier_block ft1000_netdev_notifier = { | |||
196 | void | 196 | void |
197 | ft1000InitProc (struct net_device *dev) | 197 | ft1000InitProc (struct net_device *dev) |
198 | { | 198 | { |
199 | FT1000_INFO *info; | 199 | struct ft1000_info *info; |
200 | struct proc_dir_entry *ft1000_proc_file; | 200 | struct proc_dir_entry *ft1000_proc_file; |
201 | info = (FT1000_INFO *) netdev_priv (dev); | 201 | info = (struct ft1000_info *) netdev_priv(dev); |
202 | 202 | ||
203 | 203 | ||
204 | info->ft1000_proc_dir = proc_mkdir (FT1000_PROC_DIR, FTNET_PROC); | 204 | info->ft1000_proc_dir = proc_mkdir (FT1000_PROC_DIR, FTNET_PROC); |
@@ -222,7 +222,7 @@ ft1000InitProc (struct net_device *dev) | |||
222 | } | 222 | } |
223 | 223 | ||
224 | void | 224 | void |
225 | ft1000CleanupProc (FT1000_INFO * info) | 225 | ft1000CleanupProc(struct ft1000_info *info) |
226 | { | 226 | { |
227 | remove_proc_entry (info->netdevname, info->ft1000_proc_dir); | 227 | remove_proc_entry (info->netdevname, info->ft1000_proc_dir); |
228 | remove_proc_entry (FT1000_PROC_DIR, FTNET_PROC); | 228 | remove_proc_entry (FT1000_PROC_DIR, FTNET_PROC); |
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c index 5fae9547247..28f55b2030e 100644 --- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | |||
@@ -64,7 +64,7 @@ static int ft1000_probe(struct usb_interface *interface, | |||
64 | int i, ret = 0, size; | 64 | int i, ret = 0, size; |
65 | 65 | ||
66 | struct ft1000_device *ft1000dev; | 66 | struct ft1000_device *ft1000dev; |
67 | FT1000_INFO *pft1000info; | 67 | struct ft1000_info *pft1000info; |
68 | const struct firmware *dsp_fw; | 68 | const struct firmware *dsp_fw; |
69 | 69 | ||
70 | ft1000dev = kmalloc(sizeof(struct ft1000_device), GFP_KERNEL); | 70 | ft1000dev = kmalloc(sizeof(struct ft1000_device), GFP_KERNEL); |
@@ -164,7 +164,7 @@ static int ft1000_probe(struct usb_interface *interface, | |||
164 | if (ret) | 164 | if (ret) |
165 | goto err_load; | 165 | goto err_load; |
166 | 166 | ||
167 | pft1000info = (FT1000_INFO *) netdev_priv(ft1000dev->net); | 167 | pft1000info = (struct ft1000_info *) netdev_priv(ft1000dev->net); |
168 | 168 | ||
169 | DEBUG("In probe: pft1000info=%p\n", pft1000info); | 169 | DEBUG("In probe: pft1000info=%p\n", pft1000info); |
170 | ret = dsp_reload(ft1000dev); | 170 | ret = dsp_reload(ft1000dev); |
@@ -210,11 +210,11 @@ err_fw: | |||
210 | 210 | ||
211 | static void ft1000_disconnect(struct usb_interface *interface) | 211 | static void ft1000_disconnect(struct usb_interface *interface) |
212 | { | 212 | { |
213 | FT1000_INFO *pft1000info; | 213 | struct ft1000_info *pft1000info; |
214 | 214 | ||
215 | DEBUG("ft1000_disconnect is called\n"); | 215 | DEBUG("ft1000_disconnect is called\n"); |
216 | 216 | ||
217 | pft1000info = (PFT1000_INFO) usb_get_intfdata(interface); | 217 | pft1000info = (struct ft1000_info *) usb_get_intfdata(interface); |
218 | DEBUG("In disconnect pft1000info=%p\n", pft1000info); | 218 | DEBUG("In disconnect pft1000info=%p\n", pft1000info); |
219 | 219 | ||
220 | if (pft1000info) { | 220 | if (pft1000info) { |
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h index 302a03ce50b..a9d419a98a0 100644 --- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | |||
@@ -486,7 +486,7 @@ struct ft1000_device | |||
486 | // struct net_device_stats stats; //mbelian | 486 | // struct net_device_stats stats; //mbelian |
487 | } __attribute__ ((packed)); | 487 | } __attribute__ ((packed)); |
488 | 488 | ||
489 | typedef struct _FT1000_INFO { | 489 | struct ft1000_info { |
490 | struct ft1000_device *pFt1000Dev; | 490 | struct ft1000_device *pFt1000Dev; |
491 | struct net_device_stats stats; | 491 | struct net_device_stats stats; |
492 | 492 | ||
@@ -558,7 +558,7 @@ typedef struct _FT1000_INFO { | |||
558 | unsigned short tempbuf[32]; | 558 | unsigned short tempbuf[32]; |
559 | char netdevname[IFNAMSIZ]; | 559 | char netdevname[IFNAMSIZ]; |
560 | struct proc_dir_entry *ft1000_proc_dir; //mbelian | 560 | struct proc_dir_entry *ft1000_proc_dir; //mbelian |
561 | } FT1000_INFO, *PFT1000_INFO; | 561 | }; |
562 | 562 | ||
563 | 563 | ||
564 | struct dpram_blk { | 564 | struct dpram_blk { |
@@ -601,7 +601,7 @@ int reg_ft1000_netdev(struct ft1000_device *ft1000dev, struct usb_interface *int | |||
601 | int ft1000_poll(void* dev_id); | 601 | int ft1000_poll(void* dev_id); |
602 | 602 | ||
603 | void ft1000InitProc(struct net_device *dev); | 603 | void ft1000InitProc(struct net_device *dev); |
604 | void ft1000CleanupProc(FT1000_INFO *info); | 604 | void ft1000CleanupProc(struct ft1000_info *info); |
605 | 605 | ||
606 | 606 | ||
607 | 607 | ||