diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-16 10:17:14 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-06-04 20:57:28 +0200 |
commit | e315ea6f7d1af687066506c01b8928d488f3ae98 (patch) | |
tree | 16071a0ff978696ec5937e736637286afddfd548 /arch/arm/mach-imx/iim.c | |
parent | 310c20d927142abe90e5857032ae5edfa3a025bb (diff) | |
download | barebox-e315ea6f7d1af687066506c01b8928d488f3ae98.tar.gz barebox-e315ea6f7d1af687066506c01b8928d488f3ae98.tar.xz |
ARM: i.MX: iim: don't make detour over cdev API
imx_iim_read is a iim internal function, so access the
internal functions rather than using the cdev API.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/iim.c')
-rw-r--r-- | arch/arm/mach-imx/iim.c | 41 |
1 files changed, 23 insertions, 18 deletions
diff --git a/arch/arm/mach-imx/iim.c b/arch/arm/mach-imx/iim.c index 081b9b1087..4a2c0ed401 100644 --- a/arch/arm/mach-imx/iim.c +++ b/arch/arm/mach-imx/iim.c @@ -51,6 +51,8 @@ struct iim_priv { int sense_enable; }; +static struct iim_priv *imx_iim; + static int imx_iim_fuse_sense(struct iim_bank *bank, unsigned int row) { struct iim_priv *iim = bank->iim; @@ -113,6 +115,22 @@ static ssize_t imx_iim_cdev_read(struct cdev *cdev, void *buf, size_t count, return size; } +int imx_iim_read(unsigned int banknum, int offset, void *buf, int count) +{ + struct iim_priv *iim = imx_iim; + struct iim_bank *bank; + + if (!imx_iim) + return -ENODEV; + + if (banknum > IIM_NUM_BANKS) + return -EINVAL; + + bank = iim->bank[banknum]; + + return imx_iim_cdev_read(&bank->cdev, buf, count, offset, 0); +} + static int imx_iim_fuse_blow(struct iim_bank *bank, unsigned int row, u8 value) { struct iim_priv *iim = bank->iim; @@ -274,8 +292,13 @@ static int imx_iim_probe(struct device_d *dev) struct iim_priv *iim; int i, ret; + if (imx_iim) + return -EBUSY; + iim = xzalloc(sizeof(*iim)); + imx_iim = iim; + strcpy(iim->dev.name, "iim"); iim->dev.parent = dev; iim->dev.id = DEVICE_ID_SINGLE; @@ -326,21 +349,3 @@ static int imx_iim_init(void) return 0; } coredevice_initcall(imx_iim_init); - -int imx_iim_read(unsigned int bank, int offset, void *buf, int count) -{ - struct cdev *cdev; - char *name = asprintf(DRIVERNAME "_bank%d", bank); - int ret; - - cdev = cdev_open(name, O_RDONLY); - if (!cdev) - return -ENODEV; - - ret = cdev_read(cdev, buf, count, offset, 0); - - cdev_close(cdev); - free(name); - - return ret; -} |