diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2020-11-23 16:57:23 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-11-23 16:57:23 -0800 |
| commit | 1119ea801955d93169b652f4dd3d46c455272c88 (patch) | |
| tree | bd79b690876b3c6214b1ee650138e6bba3159f0b | |
| parent | 2fc9e6842fb8fcbaee95bc7cbb99220d08dac3a9 (diff) | |
| parent | ed5ef9fb2023cb6e6a85ff6617a30acd8df63075 (diff) | |
| download | linux-1119ea801955d93169b652f4dd3d46c455272c88.tar.bz2 | |
Merge branch 'net-dsa-hellcreek-minor-cleanups'
Kurt Kanzenbach says:
====================
net: dsa: hellcreek: Minor cleanups
fix two minor issues in the hellcreek driver.
====================
Link: https://lore.kernel.org/r/20201121114455.22422-1-kurt@linutronix.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | drivers/net/dsa/hirschmann/hellcreek.c | 2 | ||||
| -rw-r--r-- | net/dsa/tag_hellcreek.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/dsa/hirschmann/hellcreek.c b/drivers/net/dsa/hirschmann/hellcreek.c index d42f40c76ba5..6420b76ea37c 100644 --- a/drivers/net/dsa/hirschmann/hellcreek.c +++ b/drivers/net/dsa/hirschmann/hellcreek.c @@ -1266,7 +1266,7 @@ static int hellcreek_probe(struct platform_device *pdev) ret = dsa_register_switch(hellcreek->ds); if (ret) { - dev_err(dev, "Unable to register switch\n"); + dev_err_probe(dev, ret, "Unable to register switch\n"); return ret; } diff --git a/net/dsa/tag_hellcreek.c b/net/dsa/tag_hellcreek.c index 2061de06eafb..a09805c8e1ab 100644 --- a/net/dsa/tag_hellcreek.c +++ b/net/dsa/tag_hellcreek.c @@ -8,9 +8,7 @@ * Based on tag_ksz.c. */ -#include <linux/etherdevice.h> -#include <linux/list.h> -#include <linux/slab.h> +#include <linux/skbuff.h> #include <net/dsa.h> #include "dsa_priv.h" |