pnp: only assign IORESOURCE_DMA if CONFIG_ISA_DMA_API is enabled

IORESOURCE_DMA cannot be assigned without utilizing the interface
provided by CONFIG_ISA_DMA_API, specifically request_dma() and
free_dma().  Thus, there's a strict dependency on the config option and
limits IORESOURCE_DMA only to architectures that support ISA-style DMA.

ia64 is not one of those architectures, so pnp_check_dma() no longer
needs to be special-cased for that architecture.

pnp_assign_resources() will now return -EINVAL if IORESOURCE_DMA is
attempted on such a kernel.

Signed-off-by: David Rientjes <rientjes@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/pnp/base.h b/drivers/pnp/base.h
index 19bc73695475078a2b3a419e9ccfb9c4a4979882..fa4e0a5db3f8a15ccfd2981f52d09c8b165b7945 100644 (file)
--- a/drivers/pnp/base.h
+++ b/drivers/pnp/base.h
@@ -142,7 +142,9 @@ void __pnp_remove_device(struct pnp_dev *dev);
 int pnp_check_port(struct pnp_dev *dev, struct resource *res);
 int pnp_check_mem(struct pnp_dev *dev, struct resource *res);
 int pnp_check_irq(struct pnp_dev *dev, struct resource *res);
+#ifdef CONFIG_ISA_DMA_API
 int pnp_check_dma(struct pnp_dev *dev, struct resource *res);
+#endif
 
 char *pnp_resource_type_name(struct resource *res);
 void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc);

diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c
index 0a15664eef1c65f2c9670f24ab03af0a604122c6..ed9ce507149ab87efe8692b24379a82ab728184c 100644 (file)
--- a/drivers/pnp/manager.c
+++ b/drivers/pnp/manager.c
@@ -171,6 +171,7 @@ __add:
        return 0;
 }
 
+#ifdef CONFIG_ISA_DMA_API
 static int pnp_assign_dma(struct pnp_dev *dev, struct pnp_dma *rule, int idx)
 {
        struct resource *res, local_res;
@@ -210,6 +211,7 @@ __add:
        pnp_add_dma_resource(dev, res->start, res->flags);
        return 0;
 }
+#endif /* CONFIG_ISA_DMA_API */
 
 void pnp_init_resources(struct pnp_dev *dev)
 {
@@ -234,7 +236,8 @@ static void pnp_clean_resource_table(struct pnp_dev *dev)
 static int pnp_assign_resources(struct pnp_dev *dev, int set)
 {
        struct pnp_option *option;
-       int nport = 0, nmem = 0, nirq = 0, ndma = 0;
+       int nport = 0, nmem = 0, nirq = 0;
+       int ndma __maybe_unused = 0;
        int ret = 0;
 
        pnp_dbg(&dev->dev, "pnp_assign_resources, try dependent set %d\n", set);
@@ -256,9 +259,11 @@ static int pnp_assign_resources(struct pnp_dev *dev, int set)
                case IORESOURCE_IRQ:
                        ret = pnp_assign_irq(dev, &option->u.irq, nirq++);
                        break;
+#ifdef CONFIG_ISA_DMA_API
                case IORESOURCE_DMA:
                        ret = pnp_assign_dma(dev, &option->u.dma, ndma++);
                        break;
+#endif
                default:
                        ret = -EINVAL;
                        break;

diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index a925e6b63d72cff9953672c285210de80c3c488e..b0ecacbe53b191147f4146510ce32b25ab48de70 100644 (file)
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -409,9 +409,9 @@ int pnp_check_irq(struct pnp_dev *dev, struct resource *res)
        return 1;
 }
 
+#ifdef CONFIG_ISA_DMA_API
 int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
 {
-#ifndef CONFIG_IA64
        int i;
        struct pnp_dev *tdev;
        struct resource *tres;
@@ -466,11 +466,8 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
        }
 
        return 1;
-#else
-       /* IA64 does not have legacy DMA */
-       return 0;
-#endif
 }
+#endif /* CONFIG_ISA_DMA_API */
 
 unsigned long pnp_resource_type(struct resource *res)
 {