diff mbox

[v2] scsi: qla4xxx: Use dma_pool_zalloc

Message ID 20161222121258.GA8278@gnr743-HP-ZBook-15 (mailing list archive)
State Changes Requested, archived
Headers show

Commit Message

Souptick Joarder Dec. 22, 2016, 12:12 p.m. UTC 
We should use dma_pool_zalloc instead of dma_pool_alloc/memset

Signed-off-by: Souptick joarder <jrdr.linux@gmail.com>
---
v2 changes:
   - Address comment from Nilesh to make same change in
     all applicable places inside qla4xxx source

 drivers/scsi/qla4xxx/ql4_mbx.c | 6 ++----
 drivers/scsi/qla4xxx/ql4_os.c  | 4 +---
 2 files changed, 3 insertions(+), 7 deletions(-)

--
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Souptick Joarder Jan. 2, 2017, 5:40 a.m. UTC | #1 
Hi Nilesh,

On Thu, Dec 22, 2016 at 5:42 PM, Souptick Joarder <jrdr.linux@gmail.com> wrote:
> We should use dma_pool_zalloc instead of dma_pool_alloc/memset
>
> Signed-off-by: Souptick joarder <jrdr.linux@gmail.com>
> ---
> v2 changes:
>    - Address comment from Nilesh to make same change in
>      all applicable places inside qla4xxx source
>
>  drivers/scsi/qla4xxx/ql4_mbx.c | 6 ++----
>  drivers/scsi/qla4xxx/ql4_os.c  | 4 +---
>  2 files changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c
> index c291fdf..8f97839 100644
> --- a/drivers/scsi/qla4xxx/ql4_mbx.c
> +++ b/drivers/scsi/qla4xxx/ql4_mbx.c
> @@ -1587,12 +1587,11 @@ int qla4xxx_get_chap(struct scsi_qla_host *ha, char *username, char *password,
>         struct ql4_chap_table *chap_table;
>         dma_addr_t chap_dma;
>
> -       chap_table = dma_pool_alloc(ha->chap_dma_pool, GFP_KERNEL, &chap_dma);
> +       chap_table = dma_pool_zalloc(ha->chap_dma_pool, GFP_KERNEL, &chap_dma);
>         if (chap_table == NULL)
>                 return -ENOMEM;
>
>         chap_size = sizeof(struct ql4_chap_table);
> -       memset(chap_table, 0, chap_size);
>
>         if (is_qla40XX(ha))
>                 offset = FLASH_CHAP_OFFSET | (idx * chap_size);
> @@ -1651,13 +1650,12 @@ int qla4xxx_set_chap(struct scsi_qla_host *ha, char *username, char *password,
>         uint32_t chap_size = 0;
>         dma_addr_t chap_dma;
>
> -       chap_table = dma_pool_alloc(ha->chap_dma_pool, GFP_KERNEL, &chap_dma);
> +       chap_table = dma_pool_zalloc(ha->chap_dma_pool, GFP_KERNEL, &chap_dma);
>         if (chap_table == NULL) {
>                 ret =  -ENOMEM;
>                 goto exit_set_chap;
>         }
>
> -       memset(chap_table, 0, sizeof(struct ql4_chap_table));
>         if (bidi)
>                 chap_table->flags |= BIT_6; /* peer */
>         else
> diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
> index 01c3610..0c91c89 100644
> --- a/drivers/scsi/qla4xxx/ql4_os.c
> +++ b/drivers/scsi/qla4xxx/ql4_os.c
> @@ -825,12 +825,10 @@ static int qla4xxx_delete_chap(struct Scsi_Host *shost, uint16_t chap_tbl_idx)
>         uint32_t chap_size;
>         int ret = 0;
>
> -       chap_table = dma_pool_alloc(ha->chap_dma_pool, GFP_KERNEL, &chap_dma);
> +       chap_table = dma_pool_zalloc(ha->chap_dma_pool, GFP_KERNEL, &chap_dma);
>         if (chap_table == NULL)
>                 return -ENOMEM;
>
> -       memset(chap_table, 0, sizeof(struct ql4_chap_table));
> -
>         if (is_qla80XX(ha))
>                 max_chap_entries = (ha->hw.flt_chap_size / 2) /
>                                    sizeof(struct ql4_chap_table);
> --
> 1.9.1
>

Any further comment on this patch ?

Regards
Souptick
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Nilesh Javali Jan. 13, 2017, 11:45 a.m. UTC | #2 
On 02/01/17, 11:10 AM, "Souptick Joarder" <jrdr.linux@gmail.com> wrote:

>Hi Nilesh,
>
>On Thu, Dec 22, 2016 at 5:42 PM, Souptick Joarder <jrdr.linux@gmail.com>
>wrote:
>> We should use dma_pool_zalloc instead of dma_pool_alloc/memset
>>
>> Signed-off-by: Souptick joarder <jrdr.linux@gmail.com>
>> ---
>> v2 changes:
>>    - Address comment from Nilesh to make same change in
>>      all applicable places inside qla4xxx source
>>
>>  drivers/scsi/qla4xxx/ql4_mbx.c | 6 ++----
>>  drivers/scsi/qla4xxx/ql4_os.c  | 4 +---
>>  2 files changed, 3 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c
>>b/drivers/scsi/qla4xxx/ql4_mbx.c
>> index c291fdf..8f97839 100644
>> --- a/drivers/scsi/qla4xxx/ql4_mbx.c
>> +++ b/drivers/scsi/qla4xxx/ql4_mbx.c
>> @@ -1587,12 +1587,11 @@ int qla4xxx_get_chap(struct scsi_qla_host *ha,
>>char *username, char *password,
>>         struct ql4_chap_table *chap_table;
>>         dma_addr_t chap_dma;
>>
>> -       chap_table = dma_pool_alloc(ha->chap_dma_pool, GFP_KERNEL,
>>&chap_dma);
>> +       chap_table = dma_pool_zalloc(ha->chap_dma_pool, GFP_KERNEL,
>>&chap_dma);
>>         if (chap_table == NULL)
>>                 return -ENOMEM;
>>
>>         chap_size = sizeof(struct ql4_chap_table);
>> -       memset(chap_table, 0, chap_size);
>>
>>         if (is_qla40XX(ha))
>>                 offset = FLASH_CHAP_OFFSET | (idx * chap_size);
>> @@ -1651,13 +1650,12 @@ int qla4xxx_set_chap(struct scsi_qla_host *ha,
>>char *username, char *password,
>>         uint32_t chap_size = 0;
>>         dma_addr_t chap_dma;
>>
>> -       chap_table = dma_pool_alloc(ha->chap_dma_pool, GFP_KERNEL,
>>&chap_dma);
>> +       chap_table = dma_pool_zalloc(ha->chap_dma_pool, GFP_KERNEL,
>>&chap_dma);
>>         if (chap_table == NULL) {
>>                 ret =  -ENOMEM;
>>                 goto exit_set_chap;
>>         }
>>
>> -       memset(chap_table, 0, sizeof(struct ql4_chap_table));
>>         if (bidi)
>>                 chap_table->flags |= BIT_6; /* peer */
>>         else
>> diff --git a/drivers/scsi/qla4xxx/ql4_os.c
>>b/drivers/scsi/qla4xxx/ql4_os.c
>> index 01c3610..0c91c89 100644
>> --- a/drivers/scsi/qla4xxx/ql4_os.c
>> +++ b/drivers/scsi/qla4xxx/ql4_os.c
>> @@ -825,12 +825,10 @@ static int qla4xxx_delete_chap(struct Scsi_Host
>>*shost, uint16_t chap_tbl_idx)
>>         uint32_t chap_size;
>>         int ret = 0;
>>
>> -       chap_table = dma_pool_alloc(ha->chap_dma_pool, GFP_KERNEL,
>>&chap_dma);
>> +       chap_table = dma_pool_zalloc(ha->chap_dma_pool, GFP_KERNEL,
>>&chap_dma);
>>         if (chap_table == NULL)
>>                 return -ENOMEM;
>>
>> -       memset(chap_table, 0, sizeof(struct ql4_chap_table));
>> -
>>         if (is_qla80XX(ha))
>>                 max_chap_entries = (ha->hw.flt_chap_size / 2) /
>>                                    sizeof(struct ql4_chap_table);
>> --
>> 1.9.1
>>
>
>Any further comment on this patch ?

Any reason for handling this only for CHAP related code and not take care
at all other places within ql4_os.c and ql4_init.c.
According to me the change should be consistent across all the affecting
files unless you think otherwise.

Thanks,
Nilesh

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c
index c291fdf..8f97839 100644
--- a/drivers/scsi/qla4xxx/ql4_mbx.c
+++ b/drivers/scsi/qla4xxx/ql4_mbx.c
@@ -1587,12 +1587,11 @@  int qla4xxx_get_chap(struct scsi_qla_host *ha, char *username, char *password,
 	struct ql4_chap_table *chap_table;
 	dma_addr_t chap_dma;

-	chap_table = dma_pool_alloc(ha->chap_dma_pool, GFP_KERNEL, &chap_dma);
+	chap_table = dma_pool_zalloc(ha->chap_dma_pool, GFP_KERNEL, &chap_dma);
 	if (chap_table == NULL)
 		return -ENOMEM;

 	chap_size = sizeof(struct ql4_chap_table);
-	memset(chap_table, 0, chap_size);

 	if (is_qla40XX(ha))
 		offset = FLASH_CHAP_OFFSET | (idx * chap_size);
@@ -1651,13 +1650,12 @@  int qla4xxx_set_chap(struct scsi_qla_host *ha, char *username, char *password,
 	uint32_t chap_size = 0;
 	dma_addr_t chap_dma;

-	chap_table = dma_pool_alloc(ha->chap_dma_pool, GFP_KERNEL, &chap_dma);
+	chap_table = dma_pool_zalloc(ha->chap_dma_pool, GFP_KERNEL, &chap_dma);
 	if (chap_table == NULL) {
 		ret =  -ENOMEM;
 		goto exit_set_chap;
 	}

-	memset(chap_table, 0, sizeof(struct ql4_chap_table));
 	if (bidi)
 		chap_table->flags |= BIT_6; /* peer */
 	else
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 01c3610..0c91c89 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -825,12 +825,10 @@  static int qla4xxx_delete_chap(struct Scsi_Host *shost, uint16_t chap_tbl_idx)
 	uint32_t chap_size;
 	int ret = 0;

-	chap_table = dma_pool_alloc(ha->chap_dma_pool, GFP_KERNEL, &chap_dma);
+	chap_table = dma_pool_zalloc(ha->chap_dma_pool, GFP_KERNEL, &chap_dma);
 	if (chap_table == NULL)
 		return -ENOMEM;

-	memset(chap_table, 0, sizeof(struct ql4_chap_table));
-
 	if (is_qla80XX(ha))
 		max_chap_entries = (ha->hw.flt_chap_size / 2) /
 				   sizeof(struct ql4_chap_table);