Hi James,
After merging the scsi tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
drivers/scsi/ipr.c:9138:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'ipr_enable_msix'
drivers/scsi/ipr.c:9165:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'ipr_enable_msi'
drivers/scsi/ipr.c:9188:23: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'name_msi_vectors'
drivers/scsi/ipr.c:9200:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'ipr_request_other_msi_irqs'
drivers/scsi/ipr.c: In function 'ipr_probe_ioa':
drivers/scsi/ipr.c:9422:4: error: implicit declaration of function 'ipr_enable_msix' [-Werror=implicit-function-declaration]
drivers/scsi/ipr.c:9425:4: error: implicit declaration of function 'ipr_enable_msi' [-Werror=implicit-function-declaration]
drivers/scsi/ipr.c:9517:3: error: implicit declaration of function 'name_msi_vectors' [-Werror=implicit-function-declaration]
drivers/scsi/ipr.c:9523:4: error: implicit declaration of function 'ipr_request_other_msi_irqs' [-Werror=implicit-function-declaration]
Caused by commit 7af0de314b73 ("[SCSI] ipr: Add support for MSI-X and
distributed completion") interacting with commit 54b956b90360 ("Remove
__dev* markings from init.h") from the drover-core.current tree.
I have added the following merge fix patch for today which could be added
directly to the scsi tree (please).
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 11 Jan 2013 11:59:34 +1100
Subject: [PATCH] [SCSI] ipr: remove new __dev* annotations
CONFIG_HOTPLUG is always true now and the __dev* macros have been removed.
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
drivers/scsi/ipr.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index e1ef0b1..8fe61da 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -9135,7 +9135,7 @@ ipr_get_chip_info(const struct pci_device_id *dev_id)
return NULL;
}
-static int __devinit ipr_enable_msix(struct ipr_ioa_cfg *ioa_cfg)
+static int ipr_enable_msix(struct ipr_ioa_cfg *ioa_cfg)
{
struct msix_entry entries[IPR_MAX_MSIX_VECTORS];
int i, err, vectors;
@@ -9162,7 +9162,7 @@ static int __devinit ipr_enable_msix(struct ipr_ioa_cfg *ioa_cfg)
return err;
}
-static int __devinit ipr_enable_msi(struct ipr_ioa_cfg *ioa_cfg)
+static int ipr_enable_msi(struct ipr_ioa_cfg *ioa_cfg)
{
int i, err, vectors;
@@ -9185,7 +9185,7 @@ static int __devinit ipr_enable_msi(struct ipr_ioa_cfg *ioa_cfg)
return err;
}
-static void __devinit name_msi_vectors(struct ipr_ioa_cfg *ioa_cfg)
+static void name_msi_vectors(struct ipr_ioa_cfg *ioa_cfg)
{
int vec_idx, n = sizeof(ioa_cfg->vectors_info[0].desc) - 1;
@@ -9197,7 +9197,7 @@ static void __devinit name_msi_vectors(struct ipr_ioa_cfg *ioa_cfg)
}
}
-static int __devinit ipr_request_other_msi_irqs(struct ipr_ioa_cfg *ioa_cfg)
+static int ipr_request_other_msi_irqs(struct ipr_ioa_cfg *ioa_cfg)
{
int i, rc;
--
1.7.10.280.gaa39
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpeJsLmxmI4p.pgp
Description: PGP signature
