← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/staging/tidspbridge/pmgr/io.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/staging/tidspbridge/pmgr/io.c
31
31
 
32
32
/*  ----------------------------------- This */
33
33
#include <ioobj.h>
34
 
#include <dspbridge/iodefs.h>
35
34
#include <dspbridge/io.h>
36
35
 
37
36
/*  ----------------------------------- Globals */
58
57
        *io_man = NULL;
59
58
 
60
59
        /* A memory base of 0 implies no memory base: */
61
 
        if ((mgr_attrts->shm_base != 0) && (mgr_attrts->usm_length == 0))
 
60
        if ((mgr_attrts->shm_base != 0) && (mgr_attrts->sm_length == 0))
62
61
                status = -EINVAL;
63
62
 
64
63
        if (mgr_attrts->word_size == 0)
68
67
                dev_get_intf_fxns(hdev_obj, &intf_fxns);
69
68
 
70
69
                /* Let Bridge channel module finish the create: */
71
 
                status = (*intf_fxns->pfn_io_create) (&hio_mgr, hdev_obj,
 
70
                status = (*intf_fxns->io_create) (&hio_mgr, hdev_obj,
72
71
                                                      mgr_attrts);
73
72
 
74
73
                if (!status) {
75
74
                        pio_mgr = (struct io_mgr_ *)hio_mgr;
76
75
                        pio_mgr->intf_fxns = intf_fxns;
77
 
                        pio_mgr->hdev_obj = hdev_obj;
 
76
                        pio_mgr->dev_obj = hdev_obj;
78
77
 
79
78
                        /* Return the new channel manager handle: */
80
79
                        *io_man = hio_mgr;
100
99
        intf_fxns = pio_mgr->intf_fxns;
101
100
 
102
101
        /* Let Bridge channel module destroy the io_mgr: */
103
 
        status = (*intf_fxns->pfn_io_destroy) (hio_mgr);
 
102
        status = (*intf_fxns->io_destroy) (hio_mgr);
104
103
 
105
104
        return status;
106
105
}