netpoll: Remove gfp parameter from __netpoll_setup

[mirror_ubuntu-artful-kernel.git] / drivers / net / team / team.c

diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index 2b1a1d61072c01b474551ed11df96a0e57331427..33008c1d1d678756ae8fbae13238763c24cc603e 100644 (file)
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -1031,8 +1031,7 @@ static void team_port_leave(struct team *team, struct team_port *port)
 }
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
-static int team_port_enable_netpoll(struct team *team, struct team_port *port,
-                                   gfp_t gfp)
+static int team_port_enable_netpoll(struct team *team, struct team_port *port)
 {
        struct netpoll *np;
        int err;
@@ -1040,11 +1039,11 @@ static int team_port_enable_netpoll(struct team *team, struct team_port *port,
        if (!team->dev->npinfo)
                return 0;
 
-       np = kzalloc(sizeof(*np), gfp);
+       np = kzalloc(sizeof(*np), GFP_KERNEL);
        if (!np)
                return -ENOMEM;
 
-       err = __netpoll_setup(np, port->dev, gfp);
+       err = __netpoll_setup(np, port->dev);
        if (err) {
                kfree(np);
                return err;
@@ -1067,8 +1066,7 @@ static void team_port_disable_netpoll(struct team_port *port)
        kfree(np);
 }
 #else
-static int team_port_enable_netpoll(struct team *team, struct team_port *port,
-                                   gfp_t gfp)
+static int team_port_enable_netpoll(struct team *team, struct team_port *port)
 {
        return 0;
 }
@@ -1156,7 +1154,7 @@ static int team_port_add(struct team *team, struct net_device *port_dev)
                goto err_vids_add;
        }
 
-       err = team_port_enable_netpoll(team, port, GFP_KERNEL);
+       err = team_port_enable_netpoll(team, port);
        if (err) {
                netdev_err(dev, "Failed to enable netpoll on device %s\n",
                           portname);
@@ -1850,7 +1848,7 @@ static void team_netpoll_cleanup(struct net_device *dev)
 }
 
 static int team_netpoll_setup(struct net_device *dev,
-                             struct netpoll_info *npifo, gfp_t gfp)
+                             struct netpoll_info *npifo)
 {
        struct team *team = netdev_priv(dev);
        struct team_port *port;
@@ -1858,7 +1856,7 @@ static int team_netpoll_setup(struct net_device *dev,
 
        mutex_lock(&team->lock);
        list_for_each_entry(port, &team->port_list, list) {
-               err = team_port_enable_netpoll(team, port, gfp);
+               err = team_port_enable_netpoll(team, port);
                if (err) {
                        __team_netpoll_cleanup(team);
                        break;