mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 11:46:19 +00:00
79bc14813c
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>
60 lines
1.6 KiB
C
60 lines
1.6 KiB
C
/*
|
|
* Support for SATA devices on Serial Attached SCSI (SAS) controllers
|
|
*
|
|
* Copyright (C) 2006 IBM Corporation
|
|
*
|
|
* Written by: Darrick J. Wong <djwong@us.ibm.com>, IBM Corporation
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of the
|
|
* License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
|
* USA
|
|
*
|
|
*/
|
|
|
|
#ifndef _SAS_ATA_H_
|
|
#define _SAS_ATA_H_
|
|
|
|
#include <linux/libata.h>
|
|
#include <scsi/libsas.h>
|
|
|
|
#ifdef CONFIG_SCSI_SAS_ATA
|
|
|
|
static inline int dev_is_sata(struct domain_device *dev)
|
|
{
|
|
return (dev->rphy->identify.target_port_protocols & SAS_PROTOCOL_SATA);
|
|
}
|
|
|
|
int sas_ata_init_host_and_port(struct domain_device *found_dev,
|
|
struct scsi_target *starget);
|
|
|
|
void sas_ata_task_abort(struct sas_task *task);
|
|
|
|
#else
|
|
|
|
|
|
static inline int dev_is_sata(struct domain_device *dev)
|
|
{
|
|
return 0;
|
|
}
|
|
static inline int sas_ata_init_host_and_port(struct domain_device *found_dev,
|
|
struct scsi_target *starget)
|
|
{
|
|
return 0;
|
|
}
|
|
static inline void sas_ata_task_abort(struct sas_task *task)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
#endif /* _SAS_ATA_H_ */
|