projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'pinctrl-v4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
rionet.c
diff --git
a/drivers/net/rionet.c
b/drivers/net/rionet.c
index dac7a0d9bb46e5d9d2385250f990a2a0acf5996c..01f08a7751f7aeb9c39be52a7766ec2800885fc8 100644
(file)
--- a/
drivers/net/rionet.c
+++ b/
drivers/net/rionet.c
@@
-396,7
+396,7
@@
static int rionet_close(struct net_device *ndev)
return 0;
}
return 0;
}
-static
int
rionet_remove_dev(struct device *dev, struct subsys_interface *sif)
+static
void
rionet_remove_dev(struct device *dev, struct subsys_interface *sif)
{
struct rio_dev *rdev = to_rio_dev(dev);
unsigned char netid = rdev->net->hport->id;
{
struct rio_dev *rdev = to_rio_dev(dev);
unsigned char netid = rdev->net->hport->id;
@@
-416,8
+416,6
@@
static int rionet_remove_dev(struct device *dev, struct subsys_interface *sif)
}
}
}
}
}
}
-
- return 0;
}
static void rionet_get_drvinfo(struct net_device *ndev,
}
static void rionet_get_drvinfo(struct net_device *ndev,