[CASSINI]: sparse annotations and fixes

- __user annotations
- NULL noise removal
- C99 initializers
- s/u32/pm_message_t/ in ->suspend()
- removal of bogus casts in iounmap() arguments
- if_mii() instead of open-coded variant

Remains to be done: ethtool conversion.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by Al Viro and committed by David S. Miller a4199b0b 9d30c171

+9 -9
+9 -9
drivers/net/cassini.c
··· 3244 3244 goto use_random_mac_addr; 3245 3245 3246 3246 /* search for beginning of vpd */ 3247 - base = 0; 3247 + base = NULL; 3248 3248 for (i = 2; i < EXPANSION_ROM_SIZE; i++) { 3249 3249 /* check for PCIR */ 3250 3250 if ((readb(p + i + 0) == 0x50) && ··· 4564 4564 /* Eventually add support for changing the advertisement 4565 4565 * on autoneg. 4566 4566 */ 4567 - static int cas_ethtool_ioctl(struct net_device *dev, void *ep_user) 4567 + static int cas_ethtool_ioctl(struct net_device *dev, void __user *ep_user) 4568 4568 { 4569 4569 struct cas *cp = netdev_priv(dev); 4570 4570 u16 bmcr; ··· 4578 4578 4579 4579 switch(ecmd.cmd) { 4580 4580 case ETHTOOL_GDRVINFO: { 4581 - struct ethtool_drvinfo info = { cmd: ETHTOOL_GDRVINFO }; 4581 + struct ethtool_drvinfo info = { .cmd = ETHTOOL_GDRVINFO }; 4582 4582 4583 4583 strncpy(info.driver, DRV_MODULE_NAME, 4584 4584 ETHTOOL_BUSINFO_LEN); ··· 4738 4738 4739 4739 /* get link status */ 4740 4740 case ETHTOOL_GLINK: { 4741 - struct ethtool_value edata = { cmd: ETHTOOL_GLINK }; 4741 + struct ethtool_value edata = { .cmd = ETHTOOL_GLINK }; 4742 4742 4743 4743 edata.data = (cp->lstate == link_up); 4744 4744 if (copy_to_user(ep_user, &edata, sizeof(edata))) ··· 4748 4748 4749 4749 /* get message-level */ 4750 4750 case ETHTOOL_GMSGLVL: { 4751 - struct ethtool_value edata = { cmd: ETHTOOL_GMSGLVL }; 4751 + struct ethtool_value edata = { .cmd = ETHTOOL_GMSGLVL }; 4752 4752 4753 4753 edata.data = cp->msg_enable; 4754 4754 if (copy_to_user(ep_user, &edata, sizeof(edata))) ··· 4874 4874 static int cas_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 4875 4875 { 4876 4876 struct cas *cp = netdev_priv(dev); 4877 - struct mii_ioctl_data *data = (struct mii_ioctl_data *)&ifr->ifr_data; 4877 + struct mii_ioctl_data *data = if_mii(ifr); 4878 4878 unsigned long flags; 4879 4879 int rc = -EOPNOTSUPP; 4880 4880 ··· 5168 5168 cas_shutdown(cp); 5169 5169 up(&cp->pm_sem); 5170 5170 5171 - iounmap((void *) cp->regs); 5171 + iounmap(cp->regs); 5172 5172 5173 5173 5174 5174 err_out_free_res: ··· 5216 5216 #endif 5217 5217 pci_free_consistent(pdev, sizeof(struct cas_init_block), 5218 5218 cp->init_block, cp->block_dvma); 5219 - iounmap((void *) cp->regs); 5219 + iounmap(cp->regs); 5220 5220 free_netdev(dev); 5221 5221 pci_release_regions(pdev); 5222 5222 pci_disable_device(pdev); ··· 5224 5224 } 5225 5225 5226 5226 #ifdef CONFIG_PM 5227 - static int cas_suspend(struct pci_dev *pdev, u32 state) 5227 + static int cas_suspend(struct pci_dev *pdev, pm_message_t state) 5228 5228 { 5229 5229 struct net_device *dev = pci_get_drvdata(pdev); 5230 5230 struct cas *cp = netdev_priv(dev);