PNP: define PNP-specific IORESOURCE_IO_* flags alongside IRQ, DMA, MEM

[deliverable/linux.git] / drivers / pnp / interface.c

diff --git a/drivers/pnp/interface.c b/drivers/pnp/interface.c
index 674e8ba0377f9fe48105a58917de6c97d205e5c1..c172b6de6b71af59c924872fc70d5b38f3310e0a 100644 (file)
--- a/drivers/pnp/interface.c
+++ b/drivers/pnp/interface.c
@@ -57,7 +57,7 @@ static void pnp_print_port(pnp_info_buffer_t * buffer, char *space,
                   "%sport 0x%x-0x%x, align 0x%x, size 0x%x, %i-bit address decoding\n",
                   space, port->min, port->max,
                   port->align ? (port->align - 1) : 0, port->size,
-                  port->flags & PNP_PORT_FLAG_16BITADDR ? 16 : 10);
+                  port->flags & IORESOURCE_IO_16BIT_ADDR ? 16 : 10);
 }
 
 static void pnp_print_irq(pnp_info_buffer_t * buffer, char *space,
@@ -216,12 +216,12 @@ static ssize_t pnp_show_options(struct device *dmdev,
                                struct device_attribute *attr, char *buf)
 {
        struct pnp_dev *dev = to_pnp_dev(dmdev);
+       pnp_info_buffer_t *buffer;
        struct pnp_option *independent = dev->independent;
        struct pnp_option *dependent = dev->dependent;
        int ret, dep = 1;
 
-       pnp_info_buffer_t *buffer = (pnp_info_buffer_t *)
-           pnp_alloc(sizeof(pnp_info_buffer_t));
+       buffer = pnp_alloc(sizeof(pnp_info_buffer_t));
        if (!buffer)
                return -ENOMEM;
 
@@ -248,17 +248,18 @@ static ssize_t pnp_show_current_resources(struct device *dmdev,
                                          char *buf)
 {
        struct pnp_dev *dev = to_pnp_dev(dmdev);
+       pnp_info_buffer_t *buffer;
        struct pnp_resource *pnp_res;
        struct resource *res;
        int ret;
-       pnp_info_buffer_t *buffer;
 
        if (!dev)
                return -EINVAL;
 
-       buffer = (pnp_info_buffer_t *) pnp_alloc(sizeof(pnp_info_buffer_t));
+       buffer = pnp_alloc(sizeof(pnp_info_buffer_t));
        if (!buffer)
                return -ENOMEM;
+
        buffer->len = PAGE_SIZE;
        buffer->buffer = buf;
        buffer->curr = buffer->buffer;
@@ -295,9 +296,9 @@ static ssize_t pnp_show_current_resources(struct device *dmdev,
        return ret;
 }
 
-static ssize_t
-pnp_set_current_resources(struct device *dmdev, struct device_attribute *attr,
-                         const char *ubuf, size_t count)
+static ssize_t pnp_set_current_resources(struct device *dmdev,
+                                        struct device_attribute *attr,
+                                        const char *ubuf, size_t count)
 {
        struct pnp_dev *dev = to_pnp_dev(dmdev);
        char *buf = (void *)ubuf;