From 17c957363b5da65da7c94f5092c8ca448140a2c6 Mon Sep 17 00:00:00 2001 From: wanzongshun Date: Fri, 14 Aug 2009 15:37:42 +0100 Subject: [PATCH] --- yaml --- r: 160797 b: refs/heads/master c: f346becf2fdba4d9dc023d28bc9a28f74dc9e4ac h: refs/heads/master i: 160795: 99a1be43d5e6b80f2988880c199b8d0d6421eac9 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-w90x900/mfp-w90p910.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index e30f52bda594..f654bcd9ee85 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58b5369e6eb6c889b540a99aa95562a66b25acf1 +refs/heads/master: f346becf2fdba4d9dc023d28bc9a28f74dc9e4ac diff --git a/trunk/arch/arm/mach-w90x900/mfp-w90p910.c b/trunk/arch/arm/mach-w90x900/mfp-w90p910.c index e11a32b6856d..4533098a0ee4 100644 --- a/trunk/arch/arm/mach-w90x900/mfp-w90p910.c +++ b/trunk/arch/arm/mach-w90x900/mfp-w90p910.c @@ -40,7 +40,7 @@ #define ENI2C0 (0x01 << 14) #define ENI2C1 (0x01 << 16) -static DECLARE_MUTEX(mfp_sem); +static DEFINE_MUTEX(mfp_mutex); void mfp_set_groupf(struct device *dev) { @@ -49,7 +49,7 @@ void mfp_set_groupf(struct device *dev) BUG_ON(!dev); - down(&mfp_sem); + mutex_lock(&mfp_mutex); dev_id = dev_name(dev); @@ -62,7 +62,7 @@ void mfp_set_groupf(struct device *dev) __raw_writel(mfpen, REG_MFSEL); - up(&mfp_sem); + mutex_unlock(&mfp_mutex); } EXPORT_SYMBOL(mfp_set_groupf); @@ -73,7 +73,7 @@ void mfp_set_groupc(struct device *dev) BUG_ON(!dev); - down(&mfp_sem); + mutex_lock(&mfp_mutex); dev_id = dev_name(dev); @@ -92,7 +92,7 @@ void mfp_set_groupc(struct device *dev) __raw_writel(mfpen, REG_MFSEL); - up(&mfp_sem); + mutex_unlock(&mfp_mutex); } EXPORT_SYMBOL(mfp_set_groupc); @@ -103,7 +103,7 @@ void mfp_set_groupi(struct device *dev) BUG_ON(!dev); - down(&mfp_sem); + mutex_lock(&mfp_mutex); dev_id = dev_name(dev); @@ -120,7 +120,7 @@ void mfp_set_groupi(struct device *dev) __raw_writel(mfpen, REG_MFSEL); - up(&mfp_sem); + mutex_unlock(&mfp_mutex); } EXPORT_SYMBOL(mfp_set_groupi); @@ -131,7 +131,7 @@ void mfp_set_groupg(struct device *dev) BUG_ON(!dev); - down(&mfp_sem); + mutex_lock(&mfp_mutex); dev_id = dev_name(dev); @@ -152,7 +152,7 @@ void mfp_set_groupg(struct device *dev) __raw_writel(mfpen, REG_MFSEL); - up(&mfp_sem); + mutex_unlock(&mfp_mutex); } EXPORT_SYMBOL(mfp_set_groupg);