Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (60 commits)
  uio: make uio_info's name and version const
  UIO: Documentation for UIO ioport info handling
  UIO: Pass information about ioports to userspace (V2)
  UIO: uio_pdrv_genirq: allow custom irq_flags
  UIO: use pci_ioremap_bar() in drivers/uio
  arm: struct device - replace bus_id with dev_name(), dev_set_name()
  libata: struct device - replace bus_id with dev_name(), dev_set_name()
  avr: struct device - replace bus_id with dev_name(), dev_set_name()
  block: struct device - replace bus_id with dev_name(), dev_set_name()
  chris: struct device - replace bus_id with dev_name(), dev_set_name()
  dmi: struct device - replace bus_id with dev_name(), dev_set_name()
  gadget: struct device - replace bus_id with dev_name(), dev_set_name()
  gpio: struct device - replace bus_id with dev_name(), dev_set_name()
  gpu: struct device - replace bus_id with dev_name(), dev_set_name()
  hwmon: struct device - replace bus_id with dev_name(), dev_set_name()
  i2o: struct device - replace bus_id with dev_name(), dev_set_name()
  IA64: struct device - replace bus_id with dev_name(), dev_set_name()
  i7300_idle: struct device - replace bus_id with dev_name(), dev_set_name()
  infiniband: struct device - replace bus_id with dev_name(), dev_set_name()
  ISDN: struct device - replace bus_id with dev_name(), dev_set_name()
  ...

3 files changed, 146 insertions, 21 deletions

diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index 2d2440cd57a9..4ca85a113aa2 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -35,6 +35,7 @@ struct uio_device {
         int                     vma_count;
         struct uio_info         *info;
         struct kobject          *map_dir;
+        struct kobject          *portio_dir;
 };
 
 static int uio_major;
@@ -75,17 +76,17 @@ static ssize_t map_offset_show(struct uio_mem *mem, char *buf)
         return sprintf(buf, "0x%lx\n", mem->addr & ~PAGE_MASK);
 }
 
-struct uio_sysfs_entry {
+struct map_sysfs_entry {
         struct attribute attr;
         ssize_t (*show)(struct uio_mem *, char *);
         ssize_t (*store)(struct uio_mem *, const char *, size_t);
 };
 
-static struct uio_sysfs_entry addr_attribute =
+static struct map_sysfs_entry addr_attribute =
         __ATTR(addr, S_IRUGO, map_addr_show, NULL);
-static struct uio_sysfs_entry size_attribute =
+static struct map_sysfs_entry size_attribute =
         __ATTR(size, S_IRUGO, map_size_show, NULL);
-static struct uio_sysfs_entry offset_attribute =
+static struct map_sysfs_entry offset_attribute =
         __ATTR(offset, S_IRUGO, map_offset_show, NULL);
 
 static struct attribute *attrs[] = {
@@ -106,9 +107,9 @@ static ssize_t map_type_show(struct kobject *kobj, struct attribute *attr,
 {
         struct uio_map *map = to_map(kobj);
         struct uio_mem *mem = map->mem;
-        struct uio_sysfs_entry *entry;
+        struct map_sysfs_entry *entry;
 
-        entry = container_of(attr, struct uio_sysfs_entry, attr);
+        entry = container_of(attr, struct map_sysfs_entry, attr);
 
         if (!entry->show)
                 return -EIO;
@@ -116,16 +117,93 @@ static ssize_t map_type_show(struct kobject *kobj, struct attribute *attr,
         return entry->show(mem, buf);
 }
 
-static struct sysfs_ops uio_sysfs_ops = {
+static struct sysfs_ops map_sysfs_ops = {
         .show = map_type_show,
 };
 
 static struct kobj_type map_attr_type = {
         .release        = map_release,
-        .sysfs_ops      = &uio_sysfs_ops,
+        .sysfs_ops      = &map_sysfs_ops,
         .default_attrs  = attrs,
 };
 
+struct uio_portio {
+        struct kobject kobj;
+        struct uio_port *port;
+};
+#define to_portio(portio) container_of(portio, struct uio_portio, kobj)
+
+static ssize_t portio_start_show(struct uio_port *port, char *buf)
+{
+        return sprintf(buf, "0x%lx\n", port->start);
+}
+
+static ssize_t portio_size_show(struct uio_port *port, char *buf)
+{
+        return sprintf(buf, "0x%lx\n", port->size);
+}
+
+static ssize_t portio_porttype_show(struct uio_port *port, char *buf)
+{
+        const char *porttypes[] = {"none", "x86", "gpio", "other"};
+
+        if ((port->porttype < 0) || (port->porttype > UIO_PORT_OTHER))
+                return -EINVAL;
+
+        return sprintf(buf, "port_%s\n", porttypes[port->porttype]);
+}
+
+struct portio_sysfs_entry {
+        struct attribute attr;
+        ssize_t (*show)(struct uio_port *, char *);
+        ssize_t (*store)(struct uio_port *, const char *, size_t);
+};
+
+static struct portio_sysfs_entry portio_start_attribute =
+        __ATTR(start, S_IRUGO, portio_start_show, NULL);
+static struct portio_sysfs_entry portio_size_attribute =
+        __ATTR(size, S_IRUGO, portio_size_show, NULL);
+static struct portio_sysfs_entry portio_porttype_attribute =
+        __ATTR(porttype, S_IRUGO, portio_porttype_show, NULL);
+
+static struct attribute *portio_attrs[] = {
+        &portio_start_attribute.attr,
+        &portio_size_attribute.attr,
+        &portio_porttype_attribute.attr,
+        NULL,
+};
+
+static void portio_release(struct kobject *kobj)
+{
+        struct uio_portio *portio = to_portio(kobj);
+        kfree(portio);
+}
+
+static ssize_t portio_type_show(struct kobject *kobj, struct attribute *attr,
+                             char *buf)
+{
+        struct uio_portio *portio = to_portio(kobj);
+        struct uio_port *port = portio->port;
+        struct portio_sysfs_entry *entry;
+
+        entry = container_of(attr, struct portio_sysfs_entry, attr);
+
+        if (!entry->show)
+                return -EIO;
+
+        return entry->show(port, buf);
+}
+
+static struct sysfs_ops portio_sysfs_ops = {
+        .show = portio_type_show,
+};
+
+static struct kobj_type portio_attr_type = {
+        .release        = portio_release,
+        .sysfs_ops      = &portio_sysfs_ops,
+        .default_attrs  = portio_attrs,
+};
+
 static ssize_t show_name(struct device *dev,
                          struct device_attribute *attr, char *buf)
 {
@@ -177,10 +255,13 @@ static struct attribute_group uio_attr_grp = {
 static int uio_dev_add_attributes(struct uio_device *idev)
 {
         int ret;
-        int mi;
+        int mi, pi;
         int map_found = 0;
+        int portio_found = 0;
         struct uio_mem *mem;
         struct uio_map *map;
+        struct uio_port *port;
+        struct uio_portio *portio;
 
         ret = sysfs_create_group(&idev->dev->kobj, &uio_attr_grp);
         if (ret)
@@ -195,25 +276,58 @@ static int uio_dev_add_attributes(struct uio_device *idev)
                         idev->map_dir = kobject_create_and_add("maps",
                                                         &idev->dev->kobj);
                         if (!idev->map_dir)
-                                goto err;
+                                goto err_map;
                 }
                 map = kzalloc(sizeof(*map), GFP_KERNEL);
                 if (!map)
-                        goto err;
+                        goto err_map;
                 kobject_init(&map->kobj, &map_attr_type);
                 map->mem = mem;
                 mem->map = map;
                 ret = kobject_add(&map->kobj, idev->map_dir, "map%d", mi);
                 if (ret)
-                        goto err;
+                        goto err_map;
                 ret = kobject_uevent(&map->kobj, KOBJ_ADD);
                 if (ret)
-                        goto err;
+                        goto err_map;
+        }
+
+        for (pi = 0; pi < MAX_UIO_PORT_REGIONS; pi++) {
+                port = &idev->info->port[pi];
+                if (port->size == 0)
+                        break;
+                if (!portio_found) {
+                        portio_found = 1;
+                        idev->portio_dir = kobject_create_and_add("portio",
+                                                        &idev->dev->kobj);
+                        if (!idev->portio_dir)
+                                goto err_portio;
+                }
+                portio = kzalloc(sizeof(*portio), GFP_KERNEL);
+                if (!portio)
+                        goto err_portio;
+                kobject_init(&portio->kobj, &portio_attr_type);
+                portio->port = port;
+                port->portio = portio;
+                ret = kobject_add(&portio->kobj, idev->portio_dir,
+                                                        "port%d", pi);
+                if (ret)
+                        goto err_portio;
+                ret = kobject_uevent(&portio->kobj, KOBJ_ADD);
+                if (ret)
+                        goto err_portio;
         }
 
         return 0;
 
-err:
+err_portio:
+        for (pi--; pi >= 0; pi--) {
+                port = &idev->info->port[pi];
+                portio = port->portio;
+                kobject_put(&portio->kobj);
+        }
+        kobject_put(idev->portio_dir);
+err_map:
         for (mi--; mi>=0; mi--) {
                 mem = &idev->info->mem[mi];
                 map = mem->map;
@@ -228,15 +342,26 @@ err_group:
 
 static void uio_dev_del_attributes(struct uio_device *idev)
 {
-        int mi;
+        int i;
         struct uio_mem *mem;
-        for (mi = 0; mi < MAX_UIO_MAPS; mi++) {
-                mem = &idev->info->mem[mi];
+        struct uio_port *port;
+
+        for (i = 0; i < MAX_UIO_MAPS; i++) {
+                mem = &idev->info->mem[i];
                 if (mem->size == 0)
                         break;
                 kobject_put(&mem->map->kobj);
         }
         kobject_put(idev->map_dir);
+
+        for (i = 0; i < MAX_UIO_PORT_REGIONS; i++) {
+                port = &idev->info->port[i];
+                if (port->size == 0)
+                        break;
+                kobject_put(&port->portio->kobj);
+        }
+        kobject_put(idev->portio_dir);
+
         sysfs_remove_group(&idev->dev->kobj, &uio_attr_grp);
 }
 
diff --git a/drivers/uio/uio_cif.c b/drivers/uio/uio_cif.c
index 57376060b978..c60b8fcf0e3e 100644
--- a/drivers/uio/uio_cif.c
+++ b/drivers/uio/uio_cif.c
@@ -57,8 +57,7 @@ static int __devinit hilscher_pci_probe(struct pci_dev *dev,
         info->mem[0].addr = pci_resource_start(dev, 0);
         if (!info->mem[0].addr)
                 goto out_release;
-        info->mem[0].internal_addr = ioremap(pci_resource_start(dev, 0),
-                                             pci_resource_len(dev, 0));
+        info->mem[0].internal_addr = pci_ioremap_bar(dev, 0);
         if (!info->mem[0].internal_addr)
                 goto out_release;
 
diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c
index 1f82c83a92ae..3f06818cf9fa 100644
--- a/drivers/uio/uio_pdrv_genirq.c
+++ b/drivers/uio/uio_pdrv_genirq.c
@@ -81,7 +81,8 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev)
                 goto bad0;
         }
 
-        if (uioinfo->handler || uioinfo->irqcontrol || uioinfo->irq_flags) {
+        if (uioinfo->handler || uioinfo->irqcontrol ||
+            uioinfo->irq_flags & IRQF_SHARED) {
                 dev_err(&pdev->dev, "interrupt configuration error\n");
                 goto bad0;
         }
@@ -132,7 +133,7 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev)
          * Interrupt sharing is not supported.
          */
 
-        uioinfo->irq_flags = IRQF_DISABLED;
+        uioinfo->irq_flags |= IRQF_DISABLED;
         uioinfo->handler = uio_pdrv_genirq_handler;
         uioinfo->irqcontrol = uio_pdrv_genirq_irqcontrol;
         uioinfo->priv = priv;