Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22444590 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Martin K. Petersen
Browse files

scsi: bfa: turn bfa_mem_{kva,dma}_setup into inline functions 



These two macros cause lots of warnings with gcc-7:

drivers/scsi/bfa/bfa_svc.c: In function 'bfa_fcxp_meminfo':
drivers/scsi/bfa/bfa_svc.c:521:103: error: '*' in boolean context, suggest '&&' instead [-Werror=int-in-bool-context]

Using inline functions makes them much more readable and avoids the
warnings.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Acked by: Anil Gurumurthy <anil.gurumurthy@cavium.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 4aaa4065

drivers/scsi/bfa/bfa_ioc.h

+17 −13
Original line number Original line Diff line number Diff line
@@ -111,20 +111,24 @@ struct bfa_meminfo_s { 
	struct bfa_mem_kva_s kva_info;

	struct bfa_mem_kva_s kva_info;

};

};





/* BFA memory segment setup macros */

/* BFA memory segment setup helpers */

#define bfa_mem_dma_setup(_meminfo, _dm_ptr, _seg_sz) do {	\

static inline void bfa_mem_dma_setup(struct bfa_meminfo_s *meminfo,

	((bfa_mem_dma_t *)(_dm_ptr))->mem_len = (_seg_sz);	\

				     struct bfa_mem_dma_s *dm_ptr,

	if (_seg_sz)						\

				     size_t seg_sz)

		list_add_tail(&((bfa_mem_dma_t *)_dm_ptr)->qe,	\

{

			      &(_meminfo)->dma_info.qe);	\

	dm_ptr->mem_len = seg_sz;

} while (0)

	if (seg_sz)

		list_add_tail(&dm_ptr->qe, &meminfo->dma_info.qe);

}





#define bfa_mem_kva_setup(_meminfo, _kva_ptr, _seg_sz) do {	\

static inline void bfa_mem_kva_setup(struct bfa_meminfo_s *meminfo,

	((bfa_mem_kva_t *)(_kva_ptr))->mem_len = (_seg_sz);	\

				     struct bfa_mem_kva_s *kva_ptr,

	if (_seg_sz)						\

				     size_t seg_sz)

		list_add_tail(&((bfa_mem_kva_t *)_kva_ptr)->qe,	\

{

			      &(_meminfo)->kva_info.qe);	\

	kva_ptr->mem_len = seg_sz;

} while (0)

	if (seg_sz)

		list_add_tail(&kva_ptr->qe, &meminfo->kva_info.qe);

}





/* BFA dma memory segments iterator */

/* BFA dma memory segments iterator */

#define bfa_mem_dma_sptr(_mod, _i)	(&(_mod)->dma_seg[(_i)])

#define bfa_mem_dma_sptr(_mod, _i)	(&(_mod)->dma_seg[(_i)])