From 3f8597f4e4b39b0505b3891f64d4c3be78d86717 Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Sun, 10 Aug 2014 15:46:55 +0100 Subject: staging: vt6655: device.h use change __device_info to vnt_private Coverting all functions to struct vnt_private in device.h and device_main.c Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/device.h | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'drivers/staging/vt6655/device.h') diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h index 96d14da..878b6d2 100644 --- a/drivers/staging/vt6655/device.h +++ b/drivers/staging/vt6655/device.h @@ -337,9 +337,10 @@ typedef struct __device_opt { u32 flags; } OPTIONS, *POPTIONS; -typedef struct __device_info { - struct __device_info *next; - struct __device_info *prev; +/* TODO Convert all functions to struct vnt_private and remove typedef */ +typedef struct vnt_private { + struct vnt_private *next; + struct vnt_private *prev; struct pci_dev *pcid; @@ -744,7 +745,8 @@ typedef struct __device_info { bool bCommit; } DEVICE_INFO, *PSDevice; -static inline bool device_get_ip(PSDevice pInfo) { +static inline bool device_get_ip(struct vnt_private *pInfo) +{ struct in_device *in_dev = (struct in_device *)pInfo->dev->ip_ptr; struct in_ifaddr *ifa; @@ -770,7 +772,10 @@ static inline PDEVICE_TD_INFO alloc_td_info(void) /*--------------------- Export Functions --------------------------*/ -bool device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, unsigned int uNodeIndex); -bool device_alloc_frag_buf(PSDevice pDevice, PSDeFragControlBlock pDeF); -int Config_FileOperation(PSDevice pDevice, bool fwrite, unsigned char *Parameter); +bool device_dma0_xmit(struct vnt_private *pDevice, + struct sk_buff *skb, unsigned int uNodeIndex); +bool device_alloc_frag_buf(struct vnt_private *pDevice, + PSDeFragControlBlock pDeF); +int Config_FileOperation(struct vnt_private *pDevice, + bool fwrite, unsigned char *Parameter); #endif -- cgit v1.1