Re: [PATCH 09/10] drivers/staging: Remove unnecessary casts of netdev_priv

From: Belisko Marek
Date: Tue Nov 16 2010 - 02:20:23 EST

Next message: Darrick J. Wong: "Incorrect size checks on mmap() for sysfs PCI resource files isbreaking X?"
Previous message: Bart Van Assche: "Re: [PATCH 8/19]: SCST SYSFS interface implementation"
Next in thread: Joe Perches: "Re: [PATCH 09/10] drivers/staging: Remove unnecessary casts ofnetdev_priv"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Hi

On Mon, Nov 15, 2010 at 10:12 PM, Joe Perches <joe@xxxxxxxxxxx> wrote:
> Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
> ---
> Âdrivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c Â | Â 54 ++++++++++----------
> Âdrivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c | Â Â8 ++--
> Âdrivers/staging/ft1000/ft1000-usb/ft1000_chdev.c Â | Â Â8 ++--
> Âdrivers/staging/ft1000/ft1000-usb/ft1000_hw.c Â Â Â| Â 16 +++---
> Âdrivers/staging/ft1000/ft1000-usb/ft1000_proc.c Â Â| Â Â6 +-
> Âdrivers/staging/ft1000/ft1000-usb/ft1000_usb.c Â Â | Â Â2 +-
> Âdrivers/staging/rtl8712/usb_intf.c Â Â Â Â Â Â Â Â | Â Â2 +-
> Â7 files changed, 48 insertions(+), 48 deletions(-)
Shouldn't be patch divided to some logical parts?
This patch fix ft1000 drivers also rtl8712. Is this correct?

If I do: grep -r -n 'netdev_priv' drivers/staging/*/*[ch]

there is a more netdev_priv occurences ;)
>
> diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
> index eed7e94..588afd5 100644
> --- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
> +++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
> @@ -132,7 +132,7 @@ inline void ft1000_asic_write(struct net_device *dev, u16 offset, u16 value)
> Â//---------------------------------------------------------------------------
> Âstatic inline u16 ft1000_read_fifo_len(struct net_device *dev)
> Â{
> - Â Â Â FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
> + Â Â Â FT1000_INFO *info = netdev_priv(dev);
>
> Â Â Â Âif (info->AsicID == ELECTRABUZZ_ID) {
> Â Â Â Â Â Â Â Âreturn (ft1000_read_reg(dev, FT1000_REG_UFIFO_STAT) - 16);
> @@ -155,7 +155,7 @@ static inline u16 ft1000_read_fifo_len(struct net_device *dev)
> Â//---------------------------------------------------------------------------
> Âu16 ft1000_read_dpram(struct net_device * dev, int offset)
> Â{
> - Â Â Â FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
> + Â Â Â FT1000_INFO *info = netdev_priv(dev);
> Â Â Â Âunsigned long flags;
> Â Â Â Âu16 data;
>
> @@ -184,7 +184,7 @@ u16 ft1000_read_dpram(struct net_device * dev, int offset)
> Âstatic inline void ft1000_write_dpram(struct net_device *dev,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âint offset, u16 value)
> Â{
> - Â Â Â FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
> + Â Â Â FT1000_INFO *info = netdev_priv(dev);
> Â Â Â Âunsigned long flags;
>
> Â Â Â Â// Provide mutual exclusive access while reading ASIC registers.
> @@ -208,7 +208,7 @@ static inline void ft1000_write_dpram(struct net_device *dev,
> Â//---------------------------------------------------------------------------
> Âu16 ft1000_read_dpram_mag_16(struct net_device *dev, int offset, int Index)
> Â{
> - Â Â Â FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
> + Â Â Â FT1000_INFO *info = netdev_priv(dev);
> Â Â Â Âunsigned long flags;
> Â Â Â Âu16 data;
>
> @@ -242,7 +242,7 @@ u16 ft1000_read_dpram_mag_16(struct net_device *dev, int offset, int Index)
> Âstatic inline void ft1000_write_dpram_mag_16(struct net_device *dev,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â int offset, u16 value, int Index)
> Â{
> - Â Â Â FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
> + Â Â Â FT1000_INFO *info = netdev_priv(dev);
> Â Â Â Âunsigned long flags;
>
> Â Â Â Â// Provide mutual exclusive access while reading ASIC registers.
> @@ -270,7 +270,7 @@ static inline void ft1000_write_dpram_mag_16(struct net_device *dev,
> Â//---------------------------------------------------------------------------
> Âu32 ft1000_read_dpram_mag_32(struct net_device *dev, int offset)
> Â{
> - Â Â Â FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
> + Â Â Â FT1000_INFO *info = netdev_priv(dev);
> Â Â Â Âunsigned long flags;
> Â Â Â Âu32 data;
>
> @@ -298,7 +298,7 @@ u32 ft1000_read_dpram_mag_32(struct net_device *dev, int offset)
> Â//---------------------------------------------------------------------------
> Âvoid ft1000_write_dpram_mag_32(struct net_device *dev, int offset, u32 value)
> Â{
> - Â Â Â FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
> + Â Â Â FT1000_INFO *info = netdev_priv(dev);
> Â Â Â Âunsigned long flags;
>
> Â Â Â Â// Provide mutual exclusive access while reading ASIC registers.
> @@ -320,7 +320,7 @@ void ft1000_write_dpram_mag_32(struct net_device *dev, int offset, u32 value)
> Â//---------------------------------------------------------------------------
> Âstatic void ft1000_enable_interrupts(struct net_device *dev)
> Â{
> - Â Â Â FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
> + Â Â Â FT1000_INFO *info = netdev_priv(dev);
> Â Â Â Âu16 tempword;
>
> Â Â Â ÂDEBUG(1, "ft1000_hw:ft1000_enable_interrupts()\n");
> @@ -345,7 +345,7 @@ static void ft1000_enable_interrupts(struct net_device *dev)
> Â//---------------------------------------------------------------------------
> Âstatic void ft1000_disable_interrupts(struct net_device *dev)
> Â{
> - Â Â Â FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
> + Â Â Â FT1000_INFO *info = netdev_priv(dev);
> Â Â Â Âu16 tempword;
>
> Â Â Â ÂDEBUG(1, "ft1000_hw: ft1000_disable_interrupts()\n");
> @@ -370,7 +370,7 @@ static void ft1000_disable_interrupts(struct net_device *dev)
> Â//---------------------------------------------------------------------------
> Âstatic void ft1000_reset_asic(struct net_device *dev)
> Â{
> - Â Â Â FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
> + Â Â Â FT1000_INFO *info = netdev_priv(dev);
> Â Â Â Âu16 tempword;
>
> Â Â Â ÂDEBUG(1, "ft1000_hw:ft1000_reset_asic called\n");
> @@ -414,7 +414,7 @@ static void ft1000_reset_asic(struct net_device *dev)
> Â//---------------------------------------------------------------------------
> Âstatic int ft1000_reset_card(struct net_device *dev)
> Â{
> - Â Â Â FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
> + Â Â Â FT1000_INFO *info = netdev_priv(dev);
> Â Â Â Âu16 tempword;
> Â Â Â Âint i;
> Â Â Â Âunsigned long flags;
> @@ -618,7 +618,7 @@ static void ft1000_hbchk(u_long data)
> Â Â Â ÂFT1000_INFO *info;
> Â Â Â ÂUSHORT tempword;
>
> - Â Â Â info = (FT1000_INFO *) netdev_priv(dev);
> + Â Â Â info = netdev_priv(dev);
>
> Â Â Â Âif (info->CardReady == 1) {
> Â Â Â Â Â Â Â Â// Perform dsp heartbeat check
> @@ -831,7 +831,7 @@ static void ft1000_hbchk(u_long data)
> Â//---------------------------------------------------------------------------
> Âvoid ft1000_send_cmd (struct net_device *dev, u16 *ptempbuffer, int size, u16 qtype)
> Â{
> - Â Â Â FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
> + Â Â Â FT1000_INFO *info = netdev_priv(dev);
> Â Â Â Âint i;
> Â Â Â Âu16 tempword;
> Â Â Â Âunsigned long flags;
> @@ -916,7 +916,7 @@ void ft1000_send_cmd (struct net_device *dev, u16 *ptempbuffer, int size, u16 qt
> Â//---------------------------------------------------------------------------
> ÂBOOLEAN ft1000_receive_cmd(struct net_device *dev, u16 * pbuffer, int maxsz, u16 *pnxtph)
> Â{
> - Â Â Â FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
> + Â Â Â FT1000_INFO *info = netdev_priv(dev);
> Â Â Â Âu16 size;
> Â Â Â Âu16 *ppseudohdr;
> Â Â Â Âint i;
> @@ -1009,7 +1009,7 @@ BOOLEAN ft1000_receive_cmd(struct net_device *dev, u16 * pbuffer, int maxsz, u16
> Â//---------------------------------------------------------------------------
> Âvoid ft1000_proc_drvmsg(struct net_device *dev)
> Â{
> - Â Â Â FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
> + Â Â Â FT1000_INFO *info = netdev_priv(dev);
> Â Â Â Âu16 msgtype;
> Â Â Â Âu16 tempword;
> Â Â Â ÂPMEDIAMSG pmediamsg;
> @@ -1292,7 +1292,7 @@ void ft1000_proc_drvmsg(struct net_device *dev)
> Â//---------------------------------------------------------------------------
> Âint ft1000_parse_dpram_msg(struct net_device *dev)
> Â{
> - Â Â Â FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
> + Â Â Â FT1000_INFO *info = netdev_priv(dev);
> Â Â Â Âu16 doorbell;
> Â Â Â Âu16 portid;
> Â Â Â Âu16 nxtph;
> @@ -1449,7 +1449,7 @@ int ft1000_parse_dpram_msg(struct net_device *dev)
> Â//---------------------------------------------------------------------------
> Âstatic void ft1000_flush_fifo(struct net_device *dev, u16 DrvErrNum)
> Â{
> - Â Â Â FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
> + Â Â Â FT1000_INFO *info = netdev_priv(dev);
> Â Â Â Âu16 i;
> Â Â Â Âu32 templong;
> Â Â Â Âu16 tempword;
> @@ -1596,7 +1596,7 @@ static void ft1000_flush_fifo(struct net_device *dev, u16 DrvErrNum)
> Âint ft1000_copy_up_pkt(struct net_device *dev)
> Â{
> Â Â Â Âu16 tempword;
> - Â Â Â FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
> + Â Â Â FT1000_INFO *info = netdev_priv(dev);
> Â Â Â Âu16 len;
> Â Â Â Âstruct sk_buff *skb;
> Â Â Â Âu16 i;
> @@ -1783,7 +1783,7 @@ int ft1000_copy_up_pkt(struct net_device *dev)
> Â//---------------------------------------------------------------------------
> Âint ft1000_copy_down_pkt(struct net_device *dev, u16 * packet, u16 len)
> Â{
> - Â Â Â FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
> + Â Â Â FT1000_INFO *info = netdev_priv(dev);
> Â Â Â Âunion {
> Â Â Â Â Â Â Â ÂPSEUDO_HDR blk;
> Â Â Â Â Â Â Â Âu16 buff[sizeof(PSEUDO_HDR) >> 1];
> @@ -1943,7 +1943,7 @@ int ft1000_copy_down_pkt(struct net_device *dev, u16 * packet, u16 len)
>
> Âstatic struct net_device_stats *ft1000_stats(struct net_device *dev)
> Â{
> - Â Â Â FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
> + Â Â Â FT1000_INFO *info = netdev_priv(dev);
> Â Â Â Âreturn (&info->stats);
> Â}
>
> @@ -1967,7 +1967,7 @@ static int ft1000_open(struct net_device *dev)
>
> Âstatic int ft1000_close(struct net_device *dev)
> Â{
> - Â Â Â FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
> + Â Â Â FT1000_INFO *info = netdev_priv(dev);
>
> Â Â Â ÂDEBUG(0, "ft1000_hw: ft1000_close()\n");
>
> @@ -1989,7 +1989,7 @@ static int ft1000_close(struct net_device *dev)
>
> Âstatic int ft1000_start_xmit(struct sk_buff *skb, struct net_device *dev)
> Â{
> - Â Â Â FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
> + Â Â Â FT1000_INFO *info = netdev_priv(dev);
> Â Â Â Âu8 *pdata;
>
> Â Â Â ÂDEBUG(1, "ft1000_hw: ft1000_start_xmit()\n");
> @@ -2026,7 +2026,7 @@ static int ft1000_start_xmit(struct sk_buff *skb, struct net_device *dev)
> Âstatic irqreturn_t ft1000_interrupt(int irq, void *dev_id)
> Â{
> Â Â Â Âstruct net_device *dev = (struct net_device *)dev_id;
> - Â Â Â FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
> + Â Â Â FT1000_INFO *info = netdev_priv(dev);
> Â Â Â Âu16 tempword;
> Â Â Â Âu16 inttype;
> Â Â Â Âint cnt;
> @@ -2091,7 +2091,7 @@ static irqreturn_t ft1000_interrupt(int irq, void *dev_id)
>
> Âvoid stop_ft1000_card(struct net_device *dev)
> Â{
> - Â Â Â FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
> + Â Â Â FT1000_INFO *info = netdev_priv(dev);
> Â Â Â ÂPPROV_RECORD ptr;
> Â// Â Â int cnt;
>
> @@ -2127,7 +2127,7 @@ static void ft1000_get_drvinfo(struct net_device *dev,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â struct ethtool_drvinfo *info)
> Â{
> Â Â Â ÂFT1000_INFO *ft_info;
> - Â Â Â ft_info = (FT1000_INFO *) netdev_priv(dev);
> + Â Â Â ft_info = netdev_priv(dev);
>
> Â Â Â Âsnprintf(info->driver, 32, "ft1000");
> Â Â Â Âsnprintf(info->bus_info, ETHTOOL_BUSINFO_LEN, "PCMCIA 0x%lx",
> @@ -2139,7 +2139,7 @@ static void ft1000_get_drvinfo(struct net_device *dev,
> Âstatic u32 ft1000_get_link(struct net_device *dev)
> Â{
> Â Â Â ÂFT1000_INFO *info;
> - Â Â Â info = (FT1000_INFO *) netdev_priv(dev);
> + Â Â Â info = netdev_priv(dev);
> Â Â Â Âreturn info->mediastate;
> Â}
>
> @@ -2185,7 +2185,7 @@ struct net_device *init_ft1000_card(unsigned short irq, int port,
> Â Â Â Â}
>
> Â Â Â ÂSET_NETDEV_DEV(dev, fdev);
> - Â Â Â info = (FT1000_INFO *) netdev_priv(dev);
> + Â Â Â info = netdev_priv(dev);
>
> Â Â Â Âmemset(info, 0, sizeof(FT1000_INFO));
>
> diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c
> index b45de9b..935608e 100644
> --- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c
> +++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c
> @@ -65,7 +65,7 @@ int ft1000ReadProc(char *page, char **start, off_t off,
> Â Â Â Âtime_t delta;
>
> Â Â Â Âdev = (struct net_device *)data;
> - Â Â Â info = (FT1000_INFO *) netdev_priv(dev);
> + Â Â Â info = netdev_priv(dev);
>
> Â Â Â Âif (off > 0) {
> Â Â Â Â Â Â Â Â*eof = 1;
> @@ -174,7 +174,7 @@ static int ft1000NotifyProc(struct notifier_block *this, unsigned long event,
> Â Â Â Âstruct net_device *dev = ptr;
> Â Â Â ÂFT1000_INFO *info;
>
> - Â Â Â info = (FT1000_INFO *) netdev_priv(dev);
> + Â Â Â info = netdev_priv(dev);
>
> Â Â Â Âswitch (event) {
> Â Â Â Âcase NETDEV_CHANGENAME:
> @@ -195,7 +195,7 @@ void ft1000InitProc(struct net_device *dev)
> Â{
> Â Â Â ÂFT1000_INFO *info;
>
> - Â Â Â info = (FT1000_INFO *) netdev_priv(dev);
> + Â Â Â info = netdev_priv(dev);
>
> Â Â Â Âinfo->proc_ft1000 = proc_mkdir(FT1000_PROC, init_net.proc_net);
> Â Â Â Âcreate_proc_read_entry(dev->name, 0644, info->proc_ft1000,
> @@ -208,7 +208,7 @@ void ft1000CleanupProc(struct net_device *dev)
> Â{
> Â Â Â ÂFT1000_INFO *info;
>
> - Â Â Â info = (FT1000_INFO *) netdev_priv(dev);
> + Â Â Â info = netdev_priv(dev);
>
> Â Â Â Âremove_proc_entry(dev->name, info->proc_ft1000);
> Â Â Â Âremove_proc_entry(FT1000_PROC, init_net.proc_net);
> diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c b/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c
> index 197b3fb..2135455 100644
> --- a/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c
> +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c
> @@ -423,7 +423,7 @@ static int ft1000_ChOpen (struct inode *Inode, struct file *File)
>
> Â Â if ( pdevobj[num] != NULL )
> Â Â Â Â //info = (struct ft1000_info *)(pdevobj[num]->net->priv);
> - Â Â Â Â Â Â Â info = (struct ft1000_info *)netdev_priv(pdevobj[num]->net);
> + Â Â Â Â Â Â Â info = netdev_priv(pdevobj[num]->net);
> Â Â else
> Â Â {
> Â Â Â Â DEBUG("ft1000_ChOpen: can not find device object %d\n", num);
> @@ -488,7 +488,7 @@ static unsigned int ft1000_ChPoll(struct file *file, poll_table *wait)
> Â Â Â Â return (-EBADF);
> Â Â }
>
> - Â Â Â info = (struct ft1000_info *) netdev_priv(dev);
> + Â Â Â info = netdev_priv(dev);
>
> Â Â // Search for matching file object
> Â Â for (i=0; i<MAX_NUM_APP; i++) {
> @@ -560,7 +560,7 @@ static long ft1000_ChIoctl (struct file *File, unsigned int Command,
> Â Â //DEBUG("FT1000:ft1000_ChIoctl:Command = 0x%x Argument = 0x%8x\n", Command, (u32)Argument);
>
> Â Â dev = File->private_data;
> - Â Â Â info = (struct ft1000_info *) netdev_priv(dev);
> + Â Â Â info = netdev_priv(dev);
> Â Â ft1000dev = info->pFt1000Dev;
> Â Â cmd = _IOC_NR(Command);
> Â Â //DEBUG("FT1000:ft1000_ChIoctl:cmd = 0x%x\n", cmd);
> @@ -900,7 +900,7 @@ static int ft1000_ChRelease (struct inode *Inode, struct file *File)
> Â Â DEBUG("ft1000_ChRelease called\n");
>
> Â Â dev = File->private_data;
> - Â Â Â info = (struct ft1000_info *) netdev_priv(dev);
> + Â Â Â info = netdev_priv(dev);
>
> Â Â if (ft1000_flarion_cnt == 0) {
> Â Â Â Â info->appcnt--;
> diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
> index b41884e..1ca01e2 100644
> --- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
> +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
> @@ -786,7 +786,7 @@ u16 init_ft1000_netdev(struct ft1000_device *ft1000dev)
> Â Â Â Âreturn -ENOMEM;
> Â Â }
>
> - Â Â Â pInfo = (struct ft1000_info *) netdev_priv(netdev);
> + Â Â Â pInfo = netdev_priv(netdev);
>
> Â Â //DEBUG("init_ft1000_netdev: gFt1000Info=%x, netdev=%x, ft1000dev=%x\n", gFt1000Info, netdev, ft1000dev);
>
> @@ -1345,7 +1345,7 @@ static int ft1000_submit_rx_urb(struct ft1000_info *info)
> Â//---------------------------------------------------------------------------
> Âstatic int ft1000_open (struct net_device *dev)
> Â{
> - Â Â Â struct ft1000_info *pInfo = (struct ft1000_info *)netdev_priv(dev);
> + Â Â Â struct ft1000_info *pInfo = netdev_priv(dev);
> Â Â struct timeval tv; //mbelian
> Â Â Â Âint ret;
>
> @@ -1386,7 +1386,7 @@ static int ft1000_open (struct net_device *dev)
> Â//---------------------------------------------------------------------------
> Âint ft1000_close(struct net_device *net)
> Â{
> - Â Â Â struct ft1000_info *pInfo = (struct ft1000_info *) netdev_priv(net);
> + Â Â Â struct ft1000_info *pInfo = netdev_priv(net);
> Â Â struct ft1000_device *ft1000dev = pInfo->pFt1000Dev;
>
> Â Â //DEBUG ("ft1000_close: netdev->refcnt=%d\n", net->refcnt);
> @@ -1409,7 +1409,7 @@ int ft1000_close(struct net_device *net)
>
> Âstatic struct net_device_stats *ft1000_netdev_stats(struct net_device *dev)
> Â{
> - Â Â Â struct ft1000_info *info = (struct ft1000_info *) netdev_priv(dev);
> + Â Â Â struct ft1000_info *info = netdev_priv(dev);
>
> Â Â Â Âreturn &(info->stats); //mbelian
> Â}
> @@ -1435,7 +1435,7 @@ Jim
> Âstatic int ft1000_chkcard (struct ft1000_device *dev) {
> Â Â u16 tempword;
> Â Â u16 status;
> - Â Â Â struct ft1000_info *info = (struct ft1000_info *) netdev_priv(dev->net);
> + Â Â Â struct ft1000_info *info = netdev_priv(dev->net);
>
> Â Â if (info->fCondResetPend)
> Â Â {
> @@ -1535,7 +1535,7 @@ static bool ft1000_receive_cmd (struct ft1000_device *dev, u16 *pbuffer, int max
> Âstatic int ft1000_dsp_prov(void *arg)
> Â{
> Â Â struct ft1000_device *dev = (struct ft1000_device *)arg;
> - Â Â Â struct ft1000_info *info = (struct ft1000_info *) netdev_priv(dev->net);
> + Â Â Â struct ft1000_info *info = netdev_priv(dev->net);
> Â Â u16 tempword;
> Â Â u16 len;
> Â Â u16 i=0;
> @@ -1618,7 +1618,7 @@ static int ft1000_dsp_prov(void *arg)
>
>
> Âstatic int ft1000_proc_drvmsg (struct ft1000_device *dev, u16 size) {
> - Â Â Â struct ft1000_info *info = (struct ft1000_info *) netdev_priv(dev->net);
> + Â Â Â struct ft1000_info *info = netdev_priv(dev->net);
> Â Â u16 msgtype;
> Â Â u16 tempword;
> Â Â Â Âstruct media_msg *pmediamsg;
> @@ -1901,7 +1901,7 @@ out:
> Âint ft1000_poll(void* dev_id) {
>
> Â Â struct ft1000_device *dev = (struct ft1000_device *)dev_id;
> - Â Â Â struct ft1000_info *info = (struct ft1000_info *) netdev_priv(dev->net);
> + Â Â Â struct ft1000_info *info = netdev_priv(dev->net);
>
> Â Â u16 tempword;
> Â Â u16 status;
> diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c b/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c
> index f665640..105846d 100644
> --- a/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c
> +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c
> @@ -65,7 +65,7 @@ ft1000ReadProc (char *page, char **start, off_t off, int count, int *eof,
> Â time_t delta;
>
> Â dev = (struct net_device *) data;
> - Â Â Â info = (struct ft1000_info *) netdev_priv(dev);
> + Â Â Â info = netdev_priv(dev);
>
> Â if (off > 0)
> Â Â {
> @@ -172,7 +172,7 @@ ft1000NotifyProc (struct notifier_block *this, unsigned long event, void *ptr)
> Â Â Â Âstruct ft1000_info *info;
> Â struct proc_dir_entry *ft1000_proc_file;
>
> -info = (struct ft1000_info *) netdev_priv(dev);
> +info = netdev_priv(dev);
>
>
> Â switch (event)
> @@ -198,7 +198,7 @@ ft1000InitProc (struct net_device *dev)
> Â{
> Â Â Â Âstruct ft1000_info *info;
> Â struct proc_dir_entry *ft1000_proc_file;
> - Â Â Â info = (struct ft1000_info *) netdev_priv(dev);
> + Â Â Â info = netdev_priv(dev);
>
>
> Â info->ft1000_proc_dir = proc_mkdir (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 99e3339..f87f928e 100644
> --- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
> +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
> @@ -163,7 +163,7 @@ static int ft1000_probe(struct usb_interface *interface,
> Â Â Â Âif (ret)
> Â Â Â Â Â Â Â Âgoto err_load;
>
> - Â Â Â pft1000info = (struct ft1000_info *) netdev_priv(ft1000dev->net);
> + Â Â Â pft1000info = netdev_priv(ft1000dev->net);
>
> Â Â Â ÂDEBUG("In probe: pft1000info=%p\n", pft1000info);
> Â Â Â Âret = dsp_reload(ft1000dev);
> diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c
> index f1f0c63..a692ee8 100644
> --- a/drivers/staging/rtl8712/usb_intf.c
> +++ b/drivers/staging/rtl8712/usb_intf.c
> @@ -527,7 +527,7 @@ error:
> Âstatic void r871xu_dev_remove(struct usb_interface *pusb_intf)
> Â{
> Â Â Â Âstruct net_device *pnetdev = usb_get_intfdata(pusb_intf);
> - Â Â Â struct _adapter *padapter = (struct _adapter *)netdev_priv(pnetdev);
> + Â Â Â struct _adapter *padapter = netdev_priv(pnetdev);
> Â Â Â Âstruct usb_device *udev = interface_to_usbdev(pusb_intf);
>
> Â Â Â Âif (padapter) {
> --
> 1.7.3.1.g432b3.dirty
>
> _______________________________________________
> devel mailing list
> devel@xxxxxxxxxxxxxxxxxxxxxx
> http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
>

thanks,

marek

--
as simple and primitive as possible
-------------------------------------------------
Marek Belisko - OPEN-NANDRA
Freelance Developer

Ruska Nova Ves 219 | Presov, 08005 Slovak Republic
Tel: +421 915 052 184
skype: marekwhite
icq: 290551086
web: http://open-nandra.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Next message: Darrick J. Wong: "Incorrect size checks on mmap() for sysfs PCI resource files isbreaking X?"
Previous message: Bart Van Assche: "Re: [PATCH 8/19]: SCST SYSFS interface implementation"
Next in thread: Joe Perches: "Re: [PATCH 09/10] drivers/staging: Remove unnecessary casts ofnetdev_priv"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]