forked from Minki/linux
scsi: libsas: Allow libsas to include SCSI header files directly
libsas needs to include some header files in the scsi directory. However these are currently hardcoded with the path "../" in the C files. Do this in the Makefile to avoid hardcoding the path. Link: https://lore.kernel.org/r/20210716074551.771312-1-yanaijie@huawei.com Cc: John Garry <john.garry@huawei.com> Reviewed-by: John Garry <john.garry@huawei.com> Signed-off-by: Jason Yan <yanaijie@huawei.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
parent
5481508885
commit
e15f669cd9
@ -18,4 +18,4 @@ libsas-y += sas_init.o \
|
||||
libsas-$(CONFIG_SCSI_SAS_ATA) += sas_ata.o
|
||||
libsas-$(CONFIG_SCSI_SAS_HOST_SMP) += sas_host_smp.o
|
||||
|
||||
ccflags-y := -DDEBUG
|
||||
ccflags-y := -DDEBUG -I$(srctree)/drivers/scsi
|
||||
|
@ -20,8 +20,8 @@
|
||||
#include <scsi/scsi.h>
|
||||
#include <scsi/scsi_transport.h>
|
||||
#include <scsi/scsi_transport_sas.h>
|
||||
#include "../scsi_sas_internal.h"
|
||||
#include "../scsi_transport_api.h"
|
||||
#include "scsi_sas_internal.h"
|
||||
#include "scsi_transport_api.h"
|
||||
#include <scsi/scsi_eh.h>
|
||||
|
||||
static enum ata_completion_errors sas_to_ata_err(struct task_status_struct *ts)
|
||||
|
@ -16,7 +16,7 @@
|
||||
#include <scsi/scsi_transport.h>
|
||||
#include <scsi/scsi_transport_sas.h>
|
||||
#include <scsi/sas_ata.h>
|
||||
#include "../scsi_sas_internal.h"
|
||||
#include "scsi_sas_internal.h"
|
||||
|
||||
/* ---------- Basic task processing for discovery purposes ---------- */
|
||||
|
||||
|
@ -18,7 +18,7 @@
|
||||
#include <scsi/sas_ata.h>
|
||||
#include <scsi/scsi_transport.h>
|
||||
#include <scsi/scsi_transport_sas.h>
|
||||
#include "../scsi_sas_internal.h"
|
||||
#include "scsi_sas_internal.h"
|
||||
|
||||
static int sas_discover_expander(struct domain_device *dev);
|
||||
static int sas_configure_routing(struct domain_device *dev, u8 *sas_addr);
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
#include <scsi/scsi_transport.h>
|
||||
#include <scsi/scsi_transport_sas.h>
|
||||
#include "../scsi_sas_internal.h"
|
||||
#include "scsi_sas_internal.h"
|
||||
|
||||
static void sas_host_smp_discover(struct sas_ha_struct *sas_ha, u8 *resp_data,
|
||||
u8 phy_id)
|
||||
|
@ -19,7 +19,7 @@
|
||||
|
||||
#include "sas_internal.h"
|
||||
|
||||
#include "../scsi_sas_internal.h"
|
||||
#include "scsi_sas_internal.h"
|
||||
|
||||
static struct kmem_cache *sas_task_cache;
|
||||
static struct kmem_cache *sas_event_cache;
|
||||
|
@ -10,7 +10,7 @@
|
||||
#include <scsi/scsi_host.h>
|
||||
#include <scsi/scsi_transport.h>
|
||||
#include <scsi/scsi_transport_sas.h>
|
||||
#include "../scsi_sas_internal.h"
|
||||
#include "scsi_sas_internal.h"
|
||||
|
||||
/* ---------- Phy events ---------- */
|
||||
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
#include <scsi/scsi_transport.h>
|
||||
#include <scsi/scsi_transport_sas.h>
|
||||
#include "../scsi_sas_internal.h"
|
||||
#include "scsi_sas_internal.h"
|
||||
|
||||
static bool phy_is_wideport_member(struct asd_sas_port *port, struct asd_sas_phy *phy)
|
||||
{
|
||||
|
@ -22,9 +22,9 @@
|
||||
#include <scsi/scsi_transport.h>
|
||||
#include <scsi/scsi_transport_sas.h>
|
||||
#include <scsi/sas_ata.h>
|
||||
#include "../scsi_sas_internal.h"
|
||||
#include "../scsi_transport_api.h"
|
||||
#include "../scsi_priv.h"
|
||||
#include "scsi_sas_internal.h"
|
||||
#include "scsi_transport_api.h"
|
||||
#include "scsi_priv.h"
|
||||
|
||||
#include <linux/err.h>
|
||||
#include <linux/blkdev.h>
|
||||
|
Loading…
Reference in New Issue
Block a user