Commit 4e7dba07 authored by Lee Jones's avatar Lee Jones Committed by Jens Axboe
Browse files

ata: include: libata: Move fields commonly over-written to separate MACRO 



This is a pre-cursor to some upcoming W=1 fix-ups.

Fixes the following W=1 kernel build warning(s):

Cc: Jens Axboe <axboe@kernel.dk>
Cc: Mark Lord <mlord@pobox.com>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Tejun Heo <tj@kernel.org>
Cc: linux-ide@vger.kernel.org
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20210528090502.1799866-2-lee.jones@linaro.org


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 9c54cd10

include/linux/libata.h

+8 −5
Original line number Diff line number Diff line
@@ -1397,25 +1397,28 @@ extern struct device_attribute *ata_common_sdev_attrs[]; 
	ATA_SCSI_COMPAT_IOCTL					\

	.queuecommand		= ata_scsi_queuecmd,		\

	.dma_need_drain		= ata_scsi_dma_need_drain,	\

	.can_queue		= ATA_DEF_QUEUE,		\

	.tag_alloc_policy	= BLK_TAG_ALLOC_RR,		\

	.this_id		= ATA_SHT_THIS_ID,		\

	.emulated		= ATA_SHT_EMULATED,		\

	.proc_name		= drv_name,			\

	.slave_configure	= ata_scsi_slave_config,	\

	.slave_destroy		= ata_scsi_slave_destroy,	\

	.bios_param		= ata_std_bios_param,		\

	.unlock_native_capacity	= ata_scsi_unlock_native_capacity



#define ATA_BASE_SHT(drv_name)					\

#define ATA_SUBBASE_SHT(drv_name)				\

	__ATA_BASE_SHT(drv_name),				\

	.can_queue		= ATA_DEF_QUEUE,		\

	.tag_alloc_policy	= BLK_TAG_ALLOC_RR,		\

	.slave_configure	= ata_scsi_slave_config



#define ATA_BASE_SHT(drv_name)					\

	ATA_SUBBASE_SHT(drv_name),				\

	.sdev_attrs		= ata_common_sdev_attrs



#ifdef CONFIG_SATA_HOST

extern struct device_attribute *ata_ncq_sdev_attrs[];



#define ATA_NCQ_SHT(drv_name)					\

	__ATA_BASE_SHT(drv_name),				\

	ATA_SUBBASE_SHT(drv_name),				\

	.sdev_attrs		= ata_ncq_sdev_attrs,		\

	.change_queue_depth	= ata_scsi_change_queue_depth

#endif