qed: Turn most GFP_ATOMIC into GFP_KERNEL

Initial driver submission used GFP_ATOMIC almost inclusively when
allocating memory. We now remedy this point, using GFP_KERNEL where
it's possible.

Signed-off-by: Yuval Mintz <Yuval.Mintz@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/qlogic/qed/qed_cxt.c b/drivers/net/ethernet/qlogic/qed/qed_cxt.c
index d3f7a0215e7e77a6e8a9951aa065a1b861a47722..fc767c07a2644bf11b12e50b005c55b6d5bae828 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_cxt.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_cxt.c
@@ -448,7 +448,7 @@ int qed_cxt_mngr_alloc(struct qed_hwfn *p_hwfn)
        struct qed_cxt_mngr *p_mngr;
        u32 i;
 
-       p_mngr = kzalloc(sizeof(*p_mngr), GFP_ATOMIC);
+       p_mngr = kzalloc(sizeof(*p_mngr), GFP_KERNEL);
        if (!p_mngr) {
                DP_NOTICE(p_hwfn, "Failed to allocate `struct qed_cxt_mngr'\n");
                return -ENOMEM;

diff --git a/drivers/net/ethernet/qlogic/qed/qed_dev.c b/drivers/net/ethernet/qlogic/qed/qed_dev.c
index bc17ed2c9cac1df9b64269becdacfc508d036ef2..acfe7be49a58f75f3efa74bfbf0382464628a66f 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_dev.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_dev.c
@@ -134,17 +134,17 @@ static int qed_init_qm_info(struct qed_hwfn *p_hwfn)
        /* PQs will be arranged as follows: First per-TC PQ then pure-LB quete.
         */
        qm_info->qm_pq_params = kzalloc(sizeof(*qm_info->qm_pq_params) *
-                                       num_pqs, GFP_ATOMIC);
+                                       num_pqs, GFP_KERNEL);
        if (!qm_info->qm_pq_params)
                goto alloc_err;
 
        qm_info->qm_vport_params = kzalloc(sizeof(*qm_info->qm_vport_params) *
-                                          num_vports, GFP_ATOMIC);
+                                          num_vports, GFP_KERNEL);
        if (!qm_info->qm_vport_params)
                goto alloc_err;
 
        qm_info->qm_port_params = kzalloc(sizeof(*qm_info->qm_port_params) *
-                                         MAX_NUM_PORTS, GFP_ATOMIC);
+                                         MAX_NUM_PORTS, GFP_KERNEL);
        if (!qm_info->qm_port_params)
                goto alloc_err;
 

diff --git a/drivers/net/ethernet/qlogic/qed/qed_hw.c b/drivers/net/ethernet/qlogic/qed/qed_hw.c
index ffa99273b3533ab372f870c0f5afbbcb9fec03d8..a95a3e4b31011afa937296662ebcf328b0b53cbb 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_hw.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_hw.c
@@ -44,7 +44,7 @@ struct qed_ptt_pool {
 int qed_ptt_pool_alloc(struct qed_hwfn *p_hwfn)
 {
        struct qed_ptt_pool *p_pool = kmalloc(sizeof(*p_pool),
-                                             GFP_ATOMIC);
+                                             GFP_KERNEL);
        int i;
 
        if (!p_pool)

diff --git a/drivers/net/ethernet/qlogic/qed/qed_int.c b/drivers/net/ethernet/qlogic/qed/qed_int.c
index 9cc9d62c1fec64844eba85ca10213a77d3158227..90ba1d71e67a7e17f7b7543471c8c21e7b096c2f 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_int.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_int.c
@@ -399,7 +399,7 @@ static int qed_int_sb_attn_alloc(struct qed_hwfn *p_hwfn,
        dma_addr_t p_phys = 0;
 
        /* SB struct */
-       p_sb = kmalloc(sizeof(*p_sb), GFP_ATOMIC);
+       p_sb = kmalloc(sizeof(*p_sb), GFP_KERNEL);
        if (!p_sb) {
                DP_NOTICE(cdev, "Failed to allocate `struct qed_sb_attn_info'\n");
                return -ENOMEM;
@@ -666,7 +666,7 @@ static int qed_int_sp_sb_alloc(struct qed_hwfn *p_hwfn,
        void *p_virt;
 
        /* SB struct */
-       p_sb = kmalloc(sizeof(*p_sb), GFP_ATOMIC);
+       p_sb = kmalloc(sizeof(*p_sb), GFP_KERNEL);
        if (!p_sb) {
                DP_NOTICE(p_hwfn, "Failed to allocate `struct qed_sb_info'\n");
                return -ENOMEM;
@@ -946,7 +946,7 @@ int qed_int_igu_read_cam(struct qed_hwfn *p_hwfn,
        u16 sb_id;
        u16 prev_sb_id = 0xFF;
 
-       p_hwfn->hw_info.p_igu_info = kzalloc(sizeof(*p_igu_info), GFP_ATOMIC);
+       p_hwfn->hw_info.p_igu_info = kzalloc(sizeof(*p_igu_info), GFP_KERNEL);
 
        if (!p_hwfn->hw_info.p_igu_info)
                return -ENOMEM;
@@ -1072,7 +1072,7 @@ static void qed_int_sp_dpc_setup(struct qed_hwfn *p_hwfn)
 
 static int qed_int_sp_dpc_alloc(struct qed_hwfn *p_hwfn)
 {
-       p_hwfn->sp_dpc = kmalloc(sizeof(*p_hwfn->sp_dpc), GFP_ATOMIC);
+       p_hwfn->sp_dpc = kmalloc(sizeof(*p_hwfn->sp_dpc), GFP_KERNEL);
        if (!p_hwfn->sp_dpc)
                return -ENOMEM;
 

diff --git a/drivers/net/ethernet/qlogic/qed/qed_mcp.c b/drivers/net/ethernet/qlogic/qed/qed_mcp.c
index 1457e30faccf1e4ce208b80223ad5e6403dcb5af..f23ce734ab637f06fe2ad5ecb56608eda7f02851 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_mcp.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_mcp.c
@@ -147,7 +147,7 @@ int qed_mcp_cmd_init(struct qed_hwfn *p_hwfn,
        u32 size;
 
        /* Allocate mcp_info structure */
-       p_hwfn->mcp_info = kzalloc(sizeof(*p_hwfn->mcp_info), GFP_ATOMIC);
+       p_hwfn->mcp_info = kzalloc(sizeof(*p_hwfn->mcp_info), GFP_KERNEL);
        if (!p_hwfn->mcp_info)
                goto err;
        p_info = p_hwfn->mcp_info;
@@ -161,10 +161,10 @@ int qed_mcp_cmd_init(struct qed_hwfn *p_hwfn,
        }
 
        size = MFW_DRV_MSG_MAX_DWORDS(p_info->mfw_mb_length) * sizeof(u32);
-       p_info->mfw_mb_cur = kzalloc(size, GFP_ATOMIC);
+       p_info->mfw_mb_cur = kzalloc(size, GFP_KERNEL);
        p_info->mfw_mb_shadow =
                kzalloc(sizeof(u32) * MFW_DRV_MSG_MAX_DWORDS(
-                               p_info->mfw_mb_length), GFP_ATOMIC);
+                               p_info->mfw_mb_length), GFP_KERNEL);
        if (!p_info->mfw_mb_shadow || !p_info->mfw_mb_addr)
                goto err;
 

diff --git a/drivers/net/ethernet/qlogic/qed/qed_spq.c b/drivers/net/ethernet/qlogic/qed/qed_spq.c
index 3dd548ab8df14aabf9fa6a551cf54aa97f704d12..f6c6c21601d75032ce30583533f9f6fd729594cf 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_spq.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_spq.c
@@ -327,7 +327,7 @@ struct qed_eq *qed_eq_alloc(struct qed_hwfn *p_hwfn,
        struct qed_eq *p_eq;
 
        /* Allocate EQ struct */
-       p_eq = kzalloc(sizeof(*p_eq), GFP_ATOMIC);
+       p_eq = kzalloc(sizeof(*p_eq), GFP_KERNEL);
        if (!p_eq) {
                DP_NOTICE(p_hwfn, "Failed to allocate `struct qed_eq'\n");
                return NULL;
@@ -457,7 +457,7 @@ int qed_spq_alloc(struct qed_hwfn *p_hwfn)
 
        /* SPQ struct */
        p_spq =
-               kzalloc(sizeof(struct qed_spq), GFP_ATOMIC);
+               kzalloc(sizeof(struct qed_spq), GFP_KERNEL);
        if (!p_spq) {
                DP_NOTICE(p_hwfn, "Failed to allocate `struct qed_spq'\n");
                return -ENOMEM;
@@ -853,7 +853,7 @@ struct qed_consq *qed_consq_alloc(struct qed_hwfn *p_hwfn)
        struct qed_consq *p_consq;
 
        /* Allocate ConsQ struct */
-       p_consq = kzalloc(sizeof(*p_consq), GFP_ATOMIC);
+       p_consq = kzalloc(sizeof(*p_consq), GFP_KERNEL);
        if (!p_consq) {
                DP_NOTICE(p_hwfn, "Failed to allocate `struct qed_consq'\n");
                return NULL;