Commit 79bc1481 authored Apr 03, 2008 by James Bottomley

[SCSI] libsas: fix missing inlines in header file



Two functions in include/scsi/sas_ata.h don't have static inlines
leading to problems if they're built in:

On Thu, 2008-04-03 at 14:06 +0200, Toralf Förster wrote:
> drivers/scsi/mvsas.o: In function `sas_ata_init_host_and_port':
> mvsas.c:(.text+0x0): multiple definition of `sas_ata_init_host_and_port'
> drivers/scsi/libsas/built-in.o:(.text+0x37f4): first defined here
> drivers/scsi/mvsas.o: In function `sas_ata_task_abort':
> mvsas.c:(.text+0x7): multiple definition of `sas_ata_task_abort'
> drivers/scsi/libsas/built-in.o:(.text+0x37fb): first defined here
> make[2]: *** [drivers/scsi/built-in.o] Error 1
> make[1]: *** [drivers/scsi] Error 2
> make: *** [drivers] Error 2

Add the correct static inline modifiers.

Tested-by: Toralf Förster <toralf.foerster@gmx.de>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

parent 2f3edc69

include/scsi/sas_ata.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -47,12 +47,12 @@ static inline int dev_is_sata(struct domain_device *dev)
		{
		return 0;
		}
		int sas_ata_init_host_and_port(struct domain_device *found_dev,
		static inline int sas_ata_init_host_and_port(struct domain_device *found_dev,
		struct scsi_target *starget)
		{
		return 0;
		}
		void sas_ata_task_abort(struct sas_task *task)
		static inline void sas_ata_task_abort(struct sas_task *task)
		{
		}
		#endif

Admin message