Commit f8771fa6 authored by kirjanov@gmail.com's avatar kirjanov@gmail.com Committed by Greg Kroah-Hartman

staging: slicoss No need type casting when using netdev_priv

No need type casting when using netdev_priv.
Signed-off-by: default avatarDenis Kirjanov <kirjanov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a71b9978
...@@ -292,7 +292,7 @@ static void slic_init_adapter(struct net_device *netdev, ...@@ -292,7 +292,7 @@ static void slic_init_adapter(struct net_device *netdev,
{ {
ushort index; ushort index;
struct slic_handle *pslic_handle; struct slic_handle *pslic_handle;
struct adapter *adapter = (struct adapter *)netdev_priv(netdev); struct adapter *adapter = netdev_priv(netdev);
/* adapter->pcidev = pcidev;*/ /* adapter->pcidev = pcidev;*/
adapter->vendid = pci_tbl_entry->vendor; adapter->vendid = pci_tbl_entry->vendor;
...@@ -484,7 +484,7 @@ static int __devinit slic_entry_probe(struct pci_dev *pcidev, ...@@ -484,7 +484,7 @@ static int __devinit slic_entry_probe(struct pci_dev *pcidev,
static int slic_entry_open(struct net_device *dev) static int slic_entry_open(struct net_device *dev)
{ {
struct adapter *adapter = (struct adapter *) netdev_priv(dev); struct adapter *adapter = netdev_priv(dev);
struct sliccard *card = adapter->card; struct sliccard *card = adapter->card;
u32 locked = 0; u32 locked = 0;
int status; int status;
...@@ -534,7 +534,7 @@ static void __devexit slic_entry_remove(struct pci_dev *pcidev) ...@@ -534,7 +534,7 @@ static void __devexit slic_entry_remove(struct pci_dev *pcidev)
struct net_device *dev = pci_get_drvdata(pcidev); struct net_device *dev = pci_get_drvdata(pcidev);
u32 mmio_start = 0; u32 mmio_start = 0;
uint mmio_len = 0; uint mmio_len = 0;
struct adapter *adapter = (struct adapter *) netdev_priv(dev); struct adapter *adapter = netdev_priv(dev);
struct sliccard *card; struct sliccard *card;
struct mcast_address *mcaddr, *mlist; struct mcast_address *mcaddr, *mlist;
...@@ -581,7 +581,7 @@ static void __devexit slic_entry_remove(struct pci_dev *pcidev) ...@@ -581,7 +581,7 @@ static void __devexit slic_entry_remove(struct pci_dev *pcidev)
static int slic_entry_halt(struct net_device *dev) static int slic_entry_halt(struct net_device *dev)
{ {
struct adapter *adapter = (struct adapter *)netdev_priv(dev); struct adapter *adapter = netdev_priv(dev);
struct sliccard *card = adapter->card; struct sliccard *card = adapter->card;
__iomem struct slic_regs *slic_regs = adapter->slic_regs; __iomem struct slic_regs *slic_regs = adapter->slic_regs;
...@@ -624,7 +624,7 @@ static int slic_entry_halt(struct net_device *dev) ...@@ -624,7 +624,7 @@ static int slic_entry_halt(struct net_device *dev)
static int slic_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) static int slic_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
{ {
struct adapter *adapter = (struct adapter *)netdev_priv(dev); struct adapter *adapter = netdev_priv(dev);
struct ethtool_cmd edata; struct ethtool_cmd edata;
struct ethtool_cmd ecmd; struct ethtool_cmd ecmd;
u32 data[7]; u32 data[7];
...@@ -787,7 +787,7 @@ static void slic_xmit_build_request(struct adapter *adapter, ...@@ -787,7 +787,7 @@ static void slic_xmit_build_request(struct adapter *adapter,
static netdev_tx_t slic_xmit_start(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t slic_xmit_start(struct sk_buff *skb, struct net_device *dev)
{ {
struct sliccard *card; struct sliccard *card;
struct adapter *adapter = (struct adapter *)netdev_priv(dev); struct adapter *adapter = netdev_priv(dev);
struct slic_hostcmd *hcmd = NULL; struct slic_hostcmd *hcmd = NULL;
u32 status = 0; u32 status = 0;
u32 skbtype = NORMAL_ETHFRAME; u32 skbtype = NORMAL_ETHFRAME;
...@@ -1071,7 +1071,7 @@ static void slic_xmit_complete(struct adapter *adapter) ...@@ -1071,7 +1071,7 @@ static void slic_xmit_complete(struct adapter *adapter)
static irqreturn_t slic_interrupt(int irq, void *dev_id) static irqreturn_t slic_interrupt(int irq, void *dev_id)
{ {
struct net_device *dev = (struct net_device *)dev_id; struct net_device *dev = (struct net_device *)dev_id;
struct adapter *adapter = (struct adapter *)netdev_priv(dev); struct adapter *adapter = netdev_priv(dev);
u32 isr; u32 isr;
if ((adapter->pshmem) && (adapter->pshmem->isr)) { if ((adapter->pshmem) && (adapter->pshmem->isr)) {
...@@ -1229,7 +1229,7 @@ static void slic_init_cleanup(struct adapter *adapter) ...@@ -1229,7 +1229,7 @@ static void slic_init_cleanup(struct adapter *adapter)
static struct net_device_stats *slic_get_stats(struct net_device *dev) static struct net_device_stats *slic_get_stats(struct net_device *dev)
{ {
struct adapter *adapter = (struct adapter *)netdev_priv(dev); struct adapter *adapter = netdev_priv(dev);
struct net_device_stats *stats; struct net_device_stats *stats;
ASSERT(adapter); ASSERT(adapter);
...@@ -1360,7 +1360,7 @@ static void slic_mcast_set_bit(struct adapter *adapter, char *address) ...@@ -1360,7 +1360,7 @@ static void slic_mcast_set_bit(struct adapter *adapter, char *address)
static void slic_mcast_set_list(struct net_device *dev) static void slic_mcast_set_list(struct net_device *dev)
{ {
struct adapter *adapter = (struct adapter *)netdev_priv(dev); struct adapter *adapter = netdev_priv(dev);
int status = STATUS_SUCCESS; int status = STATUS_SUCCESS;
int i; int i;
char *addresses; char *addresses;
...@@ -2523,7 +2523,7 @@ static bool slic_mac_filter(struct adapter *adapter, ...@@ -2523,7 +2523,7 @@ static bool slic_mac_filter(struct adapter *adapter,
static int slic_mac_set_address(struct net_device *dev, void *ptr) static int slic_mac_set_address(struct net_device *dev, void *ptr)
{ {
struct adapter *adapter = (struct adapter *)netdev_priv(dev); struct adapter *adapter = netdev_priv(dev);
struct sockaddr *addr = ptr; struct sockaddr *addr = ptr;
if (netif_running(dev)) if (netif_running(dev))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment