Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock: hwspinlock/u8500: fix build error due to undefined label hwspinlock: Don't return a value in __hwspin_unlock
This commit is contained in:
commit
c8f17084fe
|
@ -108,10 +108,8 @@ static int __devinit u8500_hsem_probe(struct platform_device *pdev)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
io_base = ioremap(res->start, resource_size(res));
|
io_base = ioremap(res->start, resource_size(res));
|
||||||
if (!io_base) {
|
if (!io_base)
|
||||||
ret = -ENOMEM;
|
return -ENOMEM;
|
||||||
goto free_state;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* make sure protocol 1 is selected */
|
/* make sure protocol 1 is selected */
|
||||||
val = readl(io_base + HSEM_CTRL_REG);
|
val = readl(io_base + HSEM_CTRL_REG);
|
||||||
|
|
|
@ -118,7 +118,6 @@ int __hwspin_trylock(struct hwspinlock *hwlock, int mode, unsigned long *flags)
|
||||||
static inline
|
static inline
|
||||||
void __hwspin_unlock(struct hwspinlock *hwlock, int mode, unsigned long *flags)
|
void __hwspin_unlock(struct hwspinlock *hwlock, int mode, unsigned long *flags)
|
||||||
{
|
{
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int hwspin_lock_get_id(struct hwspinlock *hwlock)
|
static inline int hwspin_lock_get_id(struct hwspinlock *hwlock)
|
||||||
|
|
Loading…
Reference in a new issue