From: YueHaibing <yuehaibing@huawei.com>
To: <antoine.tenart@bootlin.com>, <herbert@gondor.apana.org.au>,
<davem@davemloft.net>, <pvanleeuwen@insidesecure.com>
Cc: <linux-crypto@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
YueHaibing <yuehaibing@huawei.com>
Subject: [PATCH v2 -next] crypto: inside-secure - Fix build error without CONFIG_PCI
Date: Tue, 3 Sep 2019 09:45:18 +0800 [thread overview]
Message-ID: <20190903014518.20880-1-yuehaibing@huawei.com> (raw)
In-Reply-To: <20190902141910.1080-1-yuehaibing@huawei.com>
If CONFIG_PCI is not set, building fails:
rivers/crypto/inside-secure/safexcel.c: In function safexcel_request_ring_irq:
drivers/crypto/inside-secure/safexcel.c:944:9: error: implicit declaration of function pci_irq_vector;
did you mean rcu_irq_enter? [-Werror=implicit-function-declaration]
irq = pci_irq_vector(pci_pdev, irqid);
^~~~~~~~~~~~~~
Use #ifdef block to guard this.
Fixes: 625f269a5a7a ("crypto: inside-secure - add support for PCI based FPGA development board")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
v2: use 'ifdef' instead of 'IS_ENABLED'
---
drivers/crypto/inside-secure/safexcel.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/crypto/inside-secure/safexcel.c b/drivers/crypto/inside-secure/safexcel.c
index e12a2a3..5253900 100644
--- a/drivers/crypto/inside-secure/safexcel.c
+++ b/drivers/crypto/inside-secure/safexcel.c
@@ -937,7 +937,8 @@ static int safexcel_request_ring_irq(void *pdev, int irqid,
int ret, irq;
struct device *dev;
- if (IS_ENABLED(CONFIG_PCI) && is_pci_dev) {
+#ifdef CONFIG_PCI
+ if (is_pci_dev) {
struct pci_dev *pci_pdev = pdev;
dev = &pci_pdev->dev;
@@ -947,7 +948,10 @@ static int safexcel_request_ring_irq(void *pdev, int irqid,
irqid, irq);
return irq;
}
- } else if (IS_ENABLED(CONFIG_OF)) {
+ } else
+#endif
+ {
+#ifdef CONFIG_OF
struct platform_device *plf_pdev = pdev;
char irq_name[6] = {0}; /* "ringX\0" */
@@ -960,6 +964,7 @@ static int safexcel_request_ring_irq(void *pdev, int irqid,
irq_name, irq);
return irq;
}
+#endif
}
ret = devm_request_threaded_irq(dev, irq, handler,
@@ -1137,7 +1142,8 @@ static int safexcel_probe_generic(void *pdev,
safexcel_configure(priv);
- if (IS_ENABLED(CONFIG_PCI) && priv->version == EIP197_DEVBRD) {
+#ifdef CONFIG_PCI
+ if (priv->version == EIP197_DEVBRD) {
/*
* Request MSI vectors for global + 1 per ring -
* or just 1 for older dev images
@@ -1153,6 +1159,7 @@ static int safexcel_probe_generic(void *pdev,
return ret;
}
}
+#endif
/* Register the ring IRQ handlers and configure the rings */
priv->ring = devm_kcalloc(dev, priv->config.rings,
--
2.7.4
next prev parent reply other threads:[~2019-09-03 1:56 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-02 14:19 [PATCH -next] crypto: inside-secure - Fix build error without CONFIG_PCI YueHaibing
2019-09-03 1:32 ` Ard Biesheuvel
2019-09-03 1:45 ` YueHaibing [this message]
2019-09-04 11:57 ` [PATCH v2 " Pascal Van Leeuwen
2019-09-04 12:10 ` Ard Biesheuvel
2019-09-04 12:25 ` Pascal Van Leeuwen
2019-09-04 12:27 ` Ard Biesheuvel
2019-09-04 12:31 ` Herbert Xu
2019-09-04 12:45 ` Pascal Van Leeuwen
2019-09-04 13:08 ` Herbert Xu
2019-09-04 12:43 ` Pascal Van Leeuwen
2019-09-04 12:26 ` PCI: Add stub pci_irq_vector and others Herbert Xu
2019-09-04 14:33 ` Yuehaibing
2019-09-05 21:07 ` Bjorn Helgaas
2019-09-05 22:53 ` Herbert Xu
2019-09-20 19:42 ` Bjorn Helgaas
2019-09-20 23:16 ` Herbert Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190903014518.20880-1-yuehaibing@huawei.com \
--to=yuehaibing@huawei.com \
--cc=antoine.tenart@bootlin.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pvanleeuwen@insidesecure.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).