uio: Remove uio_pdrv and use uio_pdrv_genirq instead

The patch "UIO: fix uio_pdrv_genirq with device tree but no interrupt"
(sha1: e3a3c3a205554e564751cd9c0276b2af813d7a92)
add support to use this driver with no interrupts.
uio_pdrv_genirq also supports device-tree binding
which is not available in uio_pdrv.

That's why this uio_pdrv driver can be just removed.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Vitalii Demianets <vitas@nppfactor.kiev.ua>
Reviewed-by: Pavel Machek <pavel@denx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/uio/Kconfig b/drivers/uio/Kconfig
index 5295be0342c1acc88f5698bbdc29a16268ad551a..a81d16389a58299817c82429fa6d39895558d24f 100644 (file)
--- a/drivers/uio/Kconfig
+++ b/drivers/uio/Kconfig
@@ -23,13 +23,6 @@ config UIO_CIF
          To compile this driver as a module, choose M here: the module
          will be called uio_cif.
 
-config UIO_PDRV
-       tristate "Userspace I/O platform driver"
-       help
-         Generic platform driver for Userspace I/O devices.
-
-         If you don't know what to do here, say N.
-
 config UIO_PDRV_GENIRQ
        tristate "Userspace I/O platform driver with generic IRQ handling"
        help

diff --git a/drivers/uio/Makefile b/drivers/uio/Makefile
index b354c539507ae0e43172c10ff55030b796bcbf68..ea015a2901276aebf339df7ca0ae7d5c7858152b 100644 (file)
--- a/drivers/uio/Makefile
+++ b/drivers/uio/Makefile
@@ -1,6 +1,5 @@
 obj-$(CONFIG_UIO)      += uio.o
 obj-$(CONFIG_UIO_CIF)  += uio_cif.o
-obj-$(CONFIG_UIO_PDRV) += uio_pdrv.o
 obj-$(CONFIG_UIO_PDRV_GENIRQ)  += uio_pdrv_genirq.o
 obj-$(CONFIG_UIO_DMEM_GENIRQ)  += uio_dmem_genirq.o
 obj-$(CONFIG_UIO_AEC)  += uio_aec.o

diff --git a/drivers/uio/uio_pdrv.c b/drivers/uio/uio_pdrv.c
deleted file mode 100644 (file)
index 39be9e0..0000000
--- a/drivers/uio/uio_pdrv.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * drivers/uio/uio_pdrv.c
- *
- * Copyright (C) 2008 by Digi International Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published by
- * the Free Software Foundation.
- */
-#include <linux/platform_device.h>
-#include <linux/uio_driver.h>
-#include <linux/stringify.h>
-#include <linux/module.h>
-#include <linux/slab.h>
-
-#define DRIVER_NAME "uio_pdrv"
-
-struct uio_platdata {
-       struct uio_info *uioinfo;
-};
-
-static int uio_pdrv_probe(struct platform_device *pdev)
-{
-       struct uio_info *uioinfo = pdev->dev.platform_data;
-       struct uio_platdata *pdata;
-       struct uio_mem *uiomem;
-       int ret = -ENODEV;
-       int i;
-
-       if (!uioinfo || !uioinfo->name || !uioinfo->version) {
-               dev_dbg(&pdev->dev, "%s: err_uioinfo\n", __func__);
-               goto err_uioinfo;
-       }
-
-       pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
-       if (!pdata) {
-               ret = -ENOMEM;
-               dev_dbg(&pdev->dev, "%s: err_alloc_pdata\n", __func__);
-               goto err_alloc_pdata;
-       }
-
-       pdata->uioinfo = uioinfo;
-
-       uiomem = &uioinfo->mem[0];
-
-       for (i = 0; i < pdev->num_resources; ++i) {
-               struct resource *r = &pdev->resource[i];
-
-               if (r->flags != IORESOURCE_MEM)
-                       continue;
-
-               if (uiomem >= &uioinfo->mem[MAX_UIO_MAPS]) {
-                       dev_warn(&pdev->dev, "device has more than "
-                                       __stringify(MAX_UIO_MAPS)
-                                       " I/O memory resources.\n");
-                       break;
-               }
-
-               uiomem->memtype = UIO_MEM_PHYS;
-               uiomem->addr = r->start;
-               uiomem->size = resource_size(r);
-               uiomem->name = r->name;
-               ++uiomem;
-       }
-
-       while (uiomem < &uioinfo->mem[MAX_UIO_MAPS]) {
-               uiomem->size = 0;
-               ++uiomem;
-       }
-
-       pdata->uioinfo->priv = pdata;
-
-       ret = uio_register_device(&pdev->dev, pdata->uioinfo);
-
-       if (ret) {
-               kfree(pdata);
-err_alloc_pdata:
-err_uioinfo:
-               return ret;
-       }
-
-       platform_set_drvdata(pdev, pdata);
-
-       return 0;
-}
-
-static int uio_pdrv_remove(struct platform_device *pdev)
-{
-       struct uio_platdata *pdata = platform_get_drvdata(pdev);
-
-       uio_unregister_device(pdata->uioinfo);
-
-       kfree(pdata);
-
-       return 0;
-}
-
-static struct platform_driver uio_pdrv = {
-       .probe = uio_pdrv_probe,
-       .remove = uio_pdrv_remove,
-       .driver = {
-               .name = DRIVER_NAME,
-               .owner = THIS_MODULE,
-       },
-};
-
-module_platform_driver(uio_pdrv);
-
-MODULE_AUTHOR("Uwe Kleine-Koenig");
-MODULE_DESCRIPTION("Userspace I/O platform driver");
-MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:" DRIVER_NAME);