1 files changed, 70 insertions, 23 deletions

diff --git a/drivers/pnp/base.h b/drivers/pnp/base.h
index 360c6385686c..e3fa9a2d9a3d 100644
--- a/drivers/pnp/base.h
+++ b/drivers/pnp/base.h
@@ -1,3 +1,8 @@
+/*
+ * Copyright (C) 2008 Hewlett-Packard Development Company, L.P.
+ *      Bjorn Helgaas <bjorn.helgaas@hp.com>
+ */
+
 extern spinlock_t pnp_lock;
 void *pnp_alloc(long size);
 
@@ -25,8 +30,6 @@ struct pnp_port {
         resource_size_t align;  /* align boundary */
         resource_size_t size;   /* size of range */
         unsigned char flags;    /* port flags */
-        unsigned char pad;      /* pad */
-        struct pnp_port *next;  /* next port */
 };
 
 #define PNP_IRQ_NR 256
@@ -35,14 +38,11 @@ typedef struct { DECLARE_BITMAP(bits, PNP_IRQ_NR); } pnp_irq_mask_t;
 struct pnp_irq {
         pnp_irq_mask_t map;     /* bitmap for IRQ lines */
         unsigned char flags;    /* IRQ flags */
-        unsigned char pad;      /* pad */
-        struct pnp_irq *next;   /* next IRQ */
 };
 
 struct pnp_dma {
         unsigned char map;      /* bitmask for DMA channels */
         unsigned char flags;    /* DMA flags */
-        struct pnp_dma *next;   /* next port */
 };
 
 struct pnp_mem {
@@ -51,44 +51,91 @@ struct pnp_mem {
         resource_size_t align;  /* align boundary */
         resource_size_t size;   /* size of range */
         unsigned char flags;    /* memory flags */
-        unsigned char pad;      /* pad */
-        struct pnp_mem *next;   /* next memory resource */
 };
 
+#define PNP_OPTION_DEPENDENT            0x80000000
+#define PNP_OPTION_SET_MASK             0xffff
+#define PNP_OPTION_SET_SHIFT            12
+#define PNP_OPTION_PRIORITY_MASK        0xfff
+#define PNP_OPTION_PRIORITY_SHIFT       0
+
 #define PNP_RES_PRIORITY_PREFERRED      0
 #define PNP_RES_PRIORITY_ACCEPTABLE     1
 #define PNP_RES_PRIORITY_FUNCTIONAL     2
-#define PNP_RES_PRIORITY_INVALID        65535
+#define PNP_RES_PRIORITY_INVALID        PNP_OPTION_PRIORITY_MASK
 
 struct pnp_option {
-        unsigned short priority;        /* priority */
-        struct pnp_port *port;          /* first port */
-        struct pnp_irq *irq;            /* first IRQ */
-        struct pnp_dma *dma;            /* first DMA */
-        struct pnp_mem *mem;            /* first memory resource */
-        struct pnp_option *next;        /* used to chain dependent resources */
+        struct list_head list;
+        unsigned int flags;     /* independent/dependent, set, priority */
+
+        unsigned long type;     /* IORESOURCE_{IO,MEM,IRQ,DMA} */
+        union {
+                struct pnp_port port;
+                struct pnp_irq irq;
+                struct pnp_dma dma;
+                struct pnp_mem mem;
+        } u;
 };
 
-struct pnp_option *pnp_build_option(int priority);
-struct pnp_option *pnp_register_independent_option(struct pnp_dev *dev);
-struct pnp_option *pnp_register_dependent_option(struct pnp_dev *dev,
-                                                 int priority);
-int pnp_register_irq_resource(struct pnp_dev *dev, struct pnp_option *option,
+int pnp_register_irq_resource(struct pnp_dev *dev, unsigned int option_flags,
                               pnp_irq_mask_t *map, unsigned char flags);
-int pnp_register_dma_resource(struct pnp_dev *dev, struct pnp_option *option,
+int pnp_register_dma_resource(struct pnp_dev *dev, unsigned int option_flags,
                               unsigned char map, unsigned char flags);
-int pnp_register_port_resource(struct pnp_dev *dev, struct pnp_option *option,
+int pnp_register_port_resource(struct pnp_dev *dev, unsigned int option_flags,
                                resource_size_t min, resource_size_t max,
                                resource_size_t align, resource_size_t size,
                                unsigned char flags);
-int pnp_register_mem_resource(struct pnp_dev *dev, struct pnp_option *option,
+int pnp_register_mem_resource(struct pnp_dev *dev, unsigned int option_flags,
                               resource_size_t min, resource_size_t max,
                               resource_size_t align, resource_size_t size,
                               unsigned char flags);
+
+static inline int pnp_option_is_dependent(struct pnp_option *option)
+{
+        return option->flags & PNP_OPTION_DEPENDENT ? 1 : 0;
+}
+
+static inline unsigned int pnp_option_set(struct pnp_option *option)
+{
+        return (option->flags >> PNP_OPTION_SET_SHIFT) & PNP_OPTION_SET_MASK;
+}
+
+static inline unsigned int pnp_option_priority(struct pnp_option *option)
+{
+        return (option->flags >> PNP_OPTION_PRIORITY_SHIFT) &
+            PNP_OPTION_PRIORITY_MASK;
+}
+
+static inline unsigned int pnp_new_dependent_set(struct pnp_dev *dev,
+                                                 int priority)
+{
+        unsigned int flags;
+
+        if (priority > PNP_RES_PRIORITY_FUNCTIONAL) {
+                dev_warn(&dev->dev, "invalid dependent option priority %d "
+                         "clipped to %d", priority,
+                         PNP_RES_PRIORITY_INVALID);
+                priority = PNP_RES_PRIORITY_INVALID;
+        }
+
+        flags = PNP_OPTION_DEPENDENT |
+            ((dev->num_dependent_sets & PNP_OPTION_SET_MASK) <<
+                PNP_OPTION_SET_SHIFT) |
+            ((priority & PNP_OPTION_PRIORITY_MASK) <<
+                PNP_OPTION_PRIORITY_SHIFT);
+
+        dev->num_dependent_sets++;
+
+        return flags;
+}
+
+char *pnp_option_priority_name(struct pnp_option *option);
+void dbg_pnp_show_option(struct pnp_dev *dev, struct pnp_option *option);
+
 void pnp_init_resources(struct pnp_dev *dev);
 
 void pnp_fixup_device(struct pnp_dev *dev);
-void pnp_free_option(struct pnp_option *option);
+void pnp_free_options(struct pnp_dev *dev);
 int __pnp_add_device(struct pnp_dev *dev);
 void __pnp_remove_device(struct pnp_dev *dev);