Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / fsl-mc / bus / mc-sys.c

diff --git a/drivers/staging/fsl-mc/bus/mc-sys.c b/drivers/staging/fsl-mc/bus/mc-sys.c
index 0c185abe665e5f4bf0e0280229dd21bb812c919e..285917c7c8e43088045c21fc04765463f7985b42 100644 (file)
--- a/drivers/staging/fsl-mc/bus/mc-sys.c
+++ b/drivers/staging/fsl-mc/bus/mc-sys.c
@@ -32,13 +32,15 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "../include/mc-sys.h"
-#include "../include/mc-cmd.h"
-#include "../include/mc.h"
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/ioport.h>
 #include <linux/device.h>
+#include <linux/io.h>
+#include "../include/mc-sys.h"
+#include "../include/mc-cmd.h"
+#include "../include/mc.h"
+
 #include "dpmcp.h"
 
 /**
@@ -68,153 +70,6 @@ static u16 mc_cmd_hdr_read_cmdid(struct mc_command *cmd)
        return (cmd_id & MC_CMD_HDR_CMDID_MASK) >> MC_CMD_HDR_CMDID_SHIFT;
 }
 
-/**
- * Creates an MC I/O object
- *
- * @dev: device to be associated with the MC I/O object
- * @mc_portal_phys_addr: physical address of the MC portal to use
- * @mc_portal_size: size in bytes of the MC portal
- * @dpmcp-dev: Pointer to the DPMCP object associated with this MC I/O
- * object or NULL if none.
- * @flags: flags for the new MC I/O object
- * @new_mc_io: Area to return pointer to newly created MC I/O object
- *
- * Returns '0' on Success; Error code otherwise.
- */
-int __must_check fsl_create_mc_io(struct device *dev,
-                                 phys_addr_t mc_portal_phys_addr,
-                                 u32 mc_portal_size,
-                                 struct fsl_mc_device *dpmcp_dev,
-                                 u32 flags, struct fsl_mc_io **new_mc_io)
-{
-       int error;
-       struct fsl_mc_io *mc_io;
-       void __iomem *mc_portal_virt_addr;
-       struct resource *res;
-
-       mc_io = devm_kzalloc(dev, sizeof(*mc_io), GFP_KERNEL);
-       if (!mc_io)
-               return -ENOMEM;
-
-       mc_io->dev = dev;
-       mc_io->flags = flags;
-       mc_io->portal_phys_addr = mc_portal_phys_addr;
-       mc_io->portal_size = mc_portal_size;
-       if (flags & FSL_MC_IO_ATOMIC_CONTEXT_PORTAL)
-               spin_lock_init(&mc_io->spinlock);
-       else
-               mutex_init(&mc_io->mutex);
-
-       res = devm_request_mem_region(dev,
-                                     mc_portal_phys_addr,
-                                     mc_portal_size,
-                                     "mc_portal");
-       if (!res) {
-               dev_err(dev,
-                       "devm_request_mem_region failed for MC portal %#llx\n",
-                       mc_portal_phys_addr);
-               return -EBUSY;
-       }
-
-       mc_portal_virt_addr = devm_ioremap_nocache(dev,
-                                                  mc_portal_phys_addr,
-                                                  mc_portal_size);
-       if (!mc_portal_virt_addr) {
-               dev_err(dev,
-                       "devm_ioremap_nocache failed for MC portal %#llx\n",
-                       mc_portal_phys_addr);
-               return -ENXIO;
-       }
-
-       mc_io->portal_virt_addr = mc_portal_virt_addr;
-       if (dpmcp_dev) {
-               error = fsl_mc_io_set_dpmcp(mc_io, dpmcp_dev);
-               if (error < 0)
-                       goto error_destroy_mc_io;
-       }
-
-       *new_mc_io = mc_io;
-       return 0;
-
-error_destroy_mc_io:
-       fsl_destroy_mc_io(mc_io);
-       return error;
-}
-EXPORT_SYMBOL_GPL(fsl_create_mc_io);
-
-/**
- * Destroys an MC I/O object
- *
- * @mc_io: MC I/O object to destroy
- */
-void fsl_destroy_mc_io(struct fsl_mc_io *mc_io)
-{
-       struct fsl_mc_device *dpmcp_dev = mc_io->dpmcp_dev;
-
-       if (dpmcp_dev)
-               fsl_mc_io_unset_dpmcp(mc_io);
-
-       devm_iounmap(mc_io->dev, mc_io->portal_virt_addr);
-       devm_release_mem_region(mc_io->dev,
-                               mc_io->portal_phys_addr,
-                               mc_io->portal_size);
-
-       mc_io->portal_virt_addr = NULL;
-       devm_kfree(mc_io->dev, mc_io);
-}
-EXPORT_SYMBOL_GPL(fsl_destroy_mc_io);
-
-int fsl_mc_io_set_dpmcp(struct fsl_mc_io *mc_io,
-                       struct fsl_mc_device *dpmcp_dev)
-{
-       int error;
-
-       if (WARN_ON(!dpmcp_dev))
-               return -EINVAL;
-
-       if (WARN_ON(mc_io->dpmcp_dev))
-               return -EINVAL;
-
-       if (WARN_ON(dpmcp_dev->mc_io))
-               return -EINVAL;
-
-       error = dpmcp_open(mc_io,
-                          0,
-                          dpmcp_dev->obj_desc.id,
-                          &dpmcp_dev->mc_handle);
-       if (error < 0)
-               return error;
-
-       mc_io->dpmcp_dev = dpmcp_dev;
-       dpmcp_dev->mc_io = mc_io;
-       return 0;
-}
-EXPORT_SYMBOL_GPL(fsl_mc_io_set_dpmcp);
-
-void fsl_mc_io_unset_dpmcp(struct fsl_mc_io *mc_io)
-{
-       int error;
-       struct fsl_mc_device *dpmcp_dev = mc_io->dpmcp_dev;
-
-       if (WARN_ON(!dpmcp_dev))
-               return;
-
-       if (WARN_ON(dpmcp_dev->mc_io != mc_io))
-               return;
-
-       error = dpmcp_close(mc_io,
-                           0,
-                           dpmcp_dev->mc_handle);
-       if (error < 0) {
-               dev_err(&dpmcp_dev->dev, "dpmcp_close() failed: %d\n",
-                       error);
-       }
-
-       mc_io->dpmcp_dev = NULL;
-       dpmcp_dev->mc_io = NULL;
-}
-EXPORT_SYMBOL_GPL(fsl_mc_io_unset_dpmcp);
-
 static int mc_status_to_error(enum mc_cmd_status status)
 {
        static const int mc_status_to_error_map[] = {