Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0a9d75b authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] sa1100: use mutexes rather than semaphores 



Use a mutex in the sa1100 clock support rather than a semaphore.
Remove the unused "module" field.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 235b185c

arch/arm/mach-sa1100/clock.c

+13 −11
Original line number Original line Diff line number Diff line
@@ -9,14 +9,17 @@ 
#include <linux/string.h>

#include <linux/string.h>

#include <linux/clk.h>

#include <linux/clk.h>

#include <linux/spinlock.h>

#include <linux/spinlock.h>

#include <linux/mutex.h>





#include <asm/hardware.h>

#include <asm/hardware.h>

#include <asm/semaphore.h>





/*

 * Very simple clock implementation - we only have one clock to

 * deal with at the moment, so we only match using the "name".

 */

struct clk {

struct clk {

	struct list_head	node;

	struct list_head	node;

	unsigned long		rate;

	unsigned long		rate;

	struct module		*owner;

	const char		*name;

	const char		*name;

	unsigned int		enabled;

	unsigned int		enabled;

	void			(*enable)(void);

	void			(*enable)(void);
@@ -24,21 +27,21 @@ struct clk { 
};

};





static LIST_HEAD(clocks);

static LIST_HEAD(clocks);

static DECLARE_MUTEX(clocks_sem);

static DEFINE_MUTEX(clocks_mutex);

static DEFINE_SPINLOCK(clocks_lock);

static DEFINE_SPINLOCK(clocks_lock);





struct clk *clk_get(struct device *dev, const char *id)

struct clk *clk_get(struct device *dev, const char *id)

{

{

	struct clk *p, *clk = ERR_PTR(-ENOENT);

	struct clk *p, *clk = ERR_PTR(-ENOENT);





	down(&clocks_sem);

	mutex_lock(&clocks_mutex);

	list_for_each_entry(p, &clocks, node) {

	list_for_each_entry(p, &clocks, node) {

		if (strcmp(id, p->name) == 0 && try_module_get(p->owner)) {

		if (strcmp(id, p->name) == 0) {

			clk = p;

			clk = p;

			break;

			break;

		}

		}

	}

	}

	up(&clocks_sem);

	mutex_unlock(&clocks_mutex);





	return clk;

	return clk;

}

}
@@ -46,7 +49,6 @@ EXPORT_SYMBOL(clk_get); 




void clk_put(struct clk *clk)

void clk_put(struct clk *clk)

{

{

	module_put(clk->owner);

}

}

EXPORT_SYMBOL(clk_put);

EXPORT_SYMBOL(clk_put);
@@ -109,18 +111,18 @@ static struct clk clk_gpio27 = { 




int clk_register(struct clk *clk)

int clk_register(struct clk *clk)

{

{

	down(&clocks_sem);

	mutex_lock(&clocks_mutex);

	list_add(&clk->node, &clocks);

	list_add(&clk->node, &clocks);

	up(&clocks_sem);

	mutex_unlock(&clocks_mutex);

	return 0;

	return 0;

}

}

EXPORT_SYMBOL(clk_register);

EXPORT_SYMBOL(clk_register);





void clk_unregister(struct clk *clk)

void clk_unregister(struct clk *clk)

{

{

	down(&clocks_sem);

	mutex_lock(&clocks_mutex);

	list_del(&clk->node);

	list_del(&clk->node);

	up(&clocks_sem);

	mutex_unlock(&clocks_mutex);

}

}

EXPORT_SYMBOL(clk_unregister);

EXPORT_SYMBOL(clk_unregister);