From: David Howells <dhowells@redhat.com>
To: torvalds@osdl.org, akpm@osdl.org, hch@infradead.org,
arjan@infradead.org, matthew@wil.cx
Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org
Subject: [PATCH 7/19] MUTEX: Drivers F-H changes
Date: Mon, 12 Dec 2005 23:45:47 GMT [thread overview]
Message-ID: <200512122345.jBCNjl4F009039@warthog.cambridge.redhat.com> (raw)
In-Reply-To: <dhowells1134431145@warthog.cambridge.redhat.com>
The attached patch modifies the files of the drivers/f* thru drivers/h* to use
the new mutex functions.
Signed-Off-By: David Howells <dhowells@redhat.com>
---
warthog>diffstat -p1 mutex-drivers-FtoH-2615rc5.diff
drivers/fc4/fc.c | 8 ++++----
drivers/firmware/dcdbas.c | 2 +-
drivers/hwmon/adm1021.c | 2 +-
drivers/hwmon/adm1025.c | 2 +-
drivers/hwmon/adm1026.c | 4 ++--
drivers/hwmon/adm1031.c | 2 +-
drivers/hwmon/adm9240.c | 2 +-
drivers/hwmon/asb100.c | 4 ++--
drivers/hwmon/atxp1.c | 2 +-
drivers/hwmon/ds1621.c | 2 +-
drivers/hwmon/fscher.c | 2 +-
drivers/hwmon/fscpos.c | 2 +-
drivers/hwmon/gl518sm.c | 2 +-
drivers/hwmon/gl520sm.c | 2 +-
drivers/hwmon/it87.c | 4 ++--
drivers/hwmon/lm63.c | 2 +-
drivers/hwmon/lm75.c | 2 +-
drivers/hwmon/lm77.c | 2 +-
drivers/hwmon/lm78.c | 4 ++--
drivers/hwmon/lm80.c | 2 +-
drivers/hwmon/lm83.c | 2 +-
drivers/hwmon/lm85.c | 4 ++--
drivers/hwmon/lm87.c | 2 +-
drivers/hwmon/lm90.c | 2 +-
drivers/hwmon/lm92.c | 2 +-
drivers/hwmon/max1619.c | 2 +-
drivers/hwmon/pc87360.c | 4 ++--
drivers/hwmon/sis5595.c | 4 ++--
drivers/hwmon/smsc47b397.c | 4 ++--
drivers/hwmon/smsc47m1.c | 4 ++--
drivers/hwmon/via686a.c | 2 +-
drivers/hwmon/w83627ehf.c | 4 ++--
drivers/hwmon/w83627hf.c | 4 ++--
drivers/hwmon/w83781d.c | 4 ++--
drivers/hwmon/w83792d.c | 4 ++--
drivers/hwmon/w83l785ts.c | 2 +-
36 files changed, 52 insertions(+), 52 deletions(-)
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/fc4/fc.c linux-2.6.15-rc5-mutex/drivers/fc4/fc.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/fc4/fc.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/fc4/fc.c 2005-12-12 22:08:48.000000000 +0000
@@ -36,7 +36,7 @@
#include <asm/pgtable.h>
#include <asm/irq.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
#include "fcp_impl.h"
#include <scsi/scsi_host.h>
@@ -106,7 +106,7 @@ fc_channel *fc_channels = NULL;
#define LSMAGIC 620829043
typedef struct {
/* Must be first */
- struct semaphore sem;
+ struct mutex sem;
int magic;
int count;
logi *logi;
@@ -119,7 +119,7 @@ typedef struct {
#define LSOMAGIC 654907799
typedef struct {
/* Must be first */
- struct semaphore sem;
+ struct mutex sem;
int magic;
int count;
fcp_cmnd *fcmds;
@@ -130,7 +130,7 @@ typedef struct {
#define LSEMAGIC 84482456
typedef struct {
/* Must be first */
- struct semaphore sem;
+ struct mutex sem;
int magic;
int status;
struct timer_list timer;
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/firmware/dcdbas.c linux-2.6.15-rc5-mutex/drivers/firmware/dcdbas.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/firmware/dcdbas.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/firmware/dcdbas.c 2005-12-12 22:08:48.000000000 +0000
@@ -34,7 +34,7 @@
#include <linux/string.h>
#include <linux/types.h>
#include <asm/io.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
#include "dcdbas.h"
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/adm1021.c linux-2.6.15-rc5-mutex/drivers/hwmon/adm1021.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/adm1021.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/adm1021.c 2005-12-12 21:36:44.000000000 +0000
@@ -92,7 +92,7 @@ struct adm1021_data {
struct class_device *class_dev;
enum chips type;
- struct semaphore update_lock;
+ struct mutex update_lock;
char valid; /* !=0 if following fields are valid */
unsigned long last_updated; /* In jiffies */
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/adm1025.c linux-2.6.15-rc5-mutex/drivers/hwmon/adm1025.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/adm1025.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/adm1025.c 2005-12-12 21:36:59.000000000 +0000
@@ -133,7 +133,7 @@ static struct i2c_driver adm1025_driver
struct adm1025_data {
struct i2c_client client;
struct class_device *class_dev;
- struct semaphore update_lock;
+ struct mutex update_lock;
char valid; /* zero until following fields are valid */
unsigned long last_updated; /* in jiffies */
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/adm1026.c linux-2.6.15-rc5-mutex/drivers/hwmon/adm1026.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/adm1026.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/adm1026.c 2005-12-12 21:46:25.000000000 +0000
@@ -260,10 +260,10 @@ struct pwm_data {
struct adm1026_data {
struct i2c_client client;
struct class_device *class_dev;
- struct semaphore lock;
+ struct mutex lock;
enum chips type;
- struct semaphore update_lock;
+ struct mutex update_lock;
int valid; /* !=0 if following fields are valid */
unsigned long last_reading; /* In jiffies */
unsigned long last_config; /* In jiffies */
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/adm1031.c linux-2.6.15-rc5-mutex/drivers/hwmon/adm1031.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/adm1031.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/adm1031.c 2005-12-12 21:35:55.000000000 +0000
@@ -70,7 +70,7 @@ typedef u8 auto_chan_table_t[8][2];
struct adm1031_data {
struct i2c_client client;
struct class_device *class_dev;
- struct semaphore update_lock;
+ struct mutex update_lock;
int chip_type;
char valid; /* !=0 if following fields are valid */
unsigned long last_updated; /* In jiffies */
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/adm9240.c linux-2.6.15-rc5-mutex/drivers/hwmon/adm9240.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/adm9240.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/adm9240.c 2005-12-12 21:34:47.000000000 +0000
@@ -150,7 +150,7 @@ struct adm9240_data {
enum chips type;
struct i2c_client client;
struct class_device *class_dev;
- struct semaphore update_lock;
+ struct mutex update_lock;
char valid;
unsigned long last_updated_measure;
unsigned long last_updated_config;
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/asb100.c linux-2.6.15-rc5-mutex/drivers/hwmon/asb100.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/asb100.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/asb100.c 2005-12-12 21:36:30.000000000 +0000
@@ -182,10 +182,10 @@ static u8 DIV_TO_REG(long val)
struct asb100_data {
struct i2c_client client;
struct class_device *class_dev;
- struct semaphore lock;
+ struct mutex lock;
enum chips type;
- struct semaphore update_lock;
+ struct mutex update_lock;
unsigned long last_updated; /* In jiffies */
/* array of 2 pointers to subclients */
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/atxp1.c linux-2.6.15-rc5-mutex/drivers/hwmon/atxp1.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/atxp1.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/atxp1.c 2005-12-12 21:32:52.000000000 +0000
@@ -60,7 +60,7 @@ static struct i2c_driver atxp1_driver =
struct atxp1_data {
struct i2c_client client;
struct class_device *class_dev;
- struct semaphore update_lock;
+ struct mutex update_lock;
unsigned long last_updated;
u8 valid;
struct {
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/ds1621.c linux-2.6.15-rc5-mutex/drivers/hwmon/ds1621.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/ds1621.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/ds1621.c 2005-12-12 21:36:07.000000000 +0000
@@ -72,7 +72,7 @@ MODULE_PARM_DESC(polarity, "Output's pol
struct ds1621_data {
struct i2c_client client;
struct class_device *class_dev;
- struct semaphore update_lock;
+ struct mutex update_lock;
char valid; /* !=0 if following fields are valid */
unsigned long last_updated; /* In jiffies */
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/fscher.c linux-2.6.15-rc5-mutex/drivers/hwmon/fscher.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/fscher.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/fscher.c 2005-12-12 21:36:23.000000000 +0000
@@ -133,7 +133,7 @@ static struct i2c_driver fscher_driver =
struct fscher_data {
struct i2c_client client;
struct class_device *class_dev;
- struct semaphore update_lock;
+ struct mutex update_lock;
char valid; /* zero until following fields are valid */
unsigned long last_updated; /* in jiffies */
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/fscpos.c linux-2.6.15-rc5-mutex/drivers/hwmon/fscpos.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/fscpos.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/fscpos.c 2005-12-12 21:32:08.000000000 +0000
@@ -114,7 +114,7 @@ static struct i2c_driver fscpos_driver =
struct fscpos_data {
struct i2c_client client;
struct class_device *class_dev;
- struct semaphore update_lock;
+ struct mutex update_lock;
char valid; /* 0 until following fields are valid */
unsigned long last_updated; /* In jiffies */
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/gl518sm.c linux-2.6.15-rc5-mutex/drivers/hwmon/gl518sm.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/gl518sm.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/gl518sm.c 2005-12-12 21:36:40.000000000 +0000
@@ -120,7 +120,7 @@ struct gl518_data {
struct class_device *class_dev;
enum chips type;
- struct semaphore update_lock;
+ struct mutex update_lock;
char valid; /* !=0 if following fields are valid */
unsigned long last_updated; /* In jiffies */
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/gl520sm.c linux-2.6.15-rc5-mutex/drivers/hwmon/gl520sm.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/gl520sm.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/gl520sm.c 2005-12-12 21:34:43.000000000 +0000
@@ -121,7 +121,7 @@ static struct i2c_driver gl520_driver =
struct gl520_data {
struct i2c_client client;
struct class_device *class_dev;
- struct semaphore update_lock;
+ struct mutex update_lock;
char valid; /* zero until the following fields are valid */
unsigned long last_updated; /* in jiffies */
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/it87.c linux-2.6.15-rc5-mutex/drivers/hwmon/it87.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/it87.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/it87.c 2005-12-12 21:36:10.000000000 +0000
@@ -195,10 +195,10 @@ static int DIV_TO_REG(int val)
struct it87_data {
struct i2c_client client;
struct class_device *class_dev;
- struct semaphore lock;
+ struct mutex lock;
enum chips type;
- struct semaphore update_lock;
+ struct mutex update_lock;
char valid; /* !=0 if following fields are valid */
unsigned long last_updated; /* In jiffies */
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/lm63.c linux-2.6.15-rc5-mutex/drivers/hwmon/lm63.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/lm63.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/lm63.c 2005-12-12 21:34:13.000000000 +0000
@@ -153,7 +153,7 @@ static struct i2c_driver lm63_driver = {
struct lm63_data {
struct i2c_client client;
struct class_device *class_dev;
- struct semaphore update_lock;
+ struct mutex update_lock;
char valid; /* zero until following fields are valid */
unsigned long last_updated; /* in jiffies */
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/lm75.c linux-2.6.15-rc5-mutex/drivers/hwmon/lm75.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/lm75.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/lm75.c 2005-12-12 21:36:04.000000000 +0000
@@ -47,7 +47,7 @@ I2C_CLIENT_INSMOD_1(lm75);
struct lm75_data {
struct i2c_client client;
struct class_device *class_dev;
- struct semaphore update_lock;
+ struct mutex update_lock;
char valid; /* !=0 if following fields are valid */
unsigned long last_updated; /* In jiffies */
u16 temp_input; /* Register values */
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/lm77.c linux-2.6.15-rc5-mutex/drivers/hwmon/lm77.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/lm77.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/lm77.c 2005-12-12 21:32:04.000000000 +0000
@@ -51,7 +51,7 @@ I2C_CLIENT_INSMOD_1(lm77);
struct lm77_data {
struct i2c_client client;
struct class_device *class_dev;
- struct semaphore update_lock;
+ struct mutex update_lock;
char valid;
unsigned long last_updated; /* In jiffies */
int temp_input; /* Temperatures */
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/lm78.c linux-2.6.15-rc5-mutex/drivers/hwmon/lm78.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/lm78.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/lm78.c 2005-12-12 21:34:34.000000000 +0000
@@ -131,10 +131,10 @@ static inline int TEMP_FROM_REG(s8 val)
struct lm78_data {
struct i2c_client client;
struct class_device *class_dev;
- struct semaphore lock;
+ struct mutex lock;
enum chips type;
- struct semaphore update_lock;
+ struct mutex update_lock;
char valid; /* !=0 if following fields are valid */
unsigned long last_updated; /* In jiffies */
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/lm80.c linux-2.6.15-rc5-mutex/drivers/hwmon/lm80.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/lm80.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/lm80.c 2005-12-12 21:35:36.000000000 +0000
@@ -108,7 +108,7 @@ static inline long TEMP_FROM_REG(u16 tem
struct lm80_data {
struct i2c_client client;
struct class_device *class_dev;
- struct semaphore update_lock;
+ struct mutex update_lock;
char valid; /* !=0 if following fields are valid */
unsigned long last_updated; /* In jiffies */
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/lm83.c linux-2.6.15-rc5-mutex/drivers/hwmon/lm83.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/lm83.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/lm83.c 2005-12-12 21:33:05.000000000 +0000
@@ -139,7 +139,7 @@ static struct i2c_driver lm83_driver = {
struct lm83_data {
struct i2c_client client;
struct class_device *class_dev;
- struct semaphore update_lock;
+ struct mutex update_lock;
char valid; /* zero until following fields are valid */
unsigned long last_updated; /* in jiffies */
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/lm85.c linux-2.6.15-rc5-mutex/drivers/hwmon/lm85.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/lm85.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/lm85.c 2005-12-12 21:46:29.000000000 +0000
@@ -331,10 +331,10 @@ struct lm85_autofan {
struct lm85_data {
struct i2c_client client;
struct class_device *class_dev;
- struct semaphore lock;
+ struct mutex lock;
enum chips type;
- struct semaphore update_lock;
+ struct mutex update_lock;
int valid; /* !=0 if following fields are valid */
unsigned long last_reading; /* In jiffies */
unsigned long last_config; /* In jiffies */
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/lm87.c linux-2.6.15-rc5-mutex/drivers/hwmon/lm87.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/lm87.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/lm87.c 2005-12-12 21:35:26.000000000 +0000
@@ -176,7 +176,7 @@ static struct i2c_driver lm87_driver = {
struct lm87_data {
struct i2c_client client;
struct class_device *class_dev;
- struct semaphore update_lock;
+ struct mutex update_lock;
char valid; /* zero until following fields are valid */
unsigned long last_updated; /* In jiffies */
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/lm90.c linux-2.6.15-rc5-mutex/drivers/hwmon/lm90.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/lm90.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/lm90.c 2005-12-12 21:35:33.000000000 +0000
@@ -201,7 +201,7 @@ static struct i2c_driver lm90_driver = {
struct lm90_data {
struct i2c_client client;
struct class_device *class_dev;
- struct semaphore update_lock;
+ struct mutex update_lock;
char valid; /* zero until following fields are valid */
unsigned long last_updated; /* in jiffies */
int kind;
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/lm92.c linux-2.6.15-rc5-mutex/drivers/hwmon/lm92.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/lm92.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/lm92.c 2005-12-12 21:32:22.000000000 +0000
@@ -96,7 +96,7 @@ static struct i2c_driver lm92_driver;
struct lm92_data {
struct i2c_client client;
struct class_device *class_dev;
- struct semaphore update_lock;
+ struct mutex update_lock;
char valid; /* zero until following fields are valid */
unsigned long last_updated; /* in jiffies */
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/max1619.c linux-2.6.15-rc5-mutex/drivers/hwmon/max1619.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/max1619.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/max1619.c 2005-12-12 21:32:26.000000000 +0000
@@ -104,7 +104,7 @@ static struct i2c_driver max1619_driver
struct max1619_data {
struct i2c_client client;
struct class_device *class_dev;
- struct semaphore update_lock;
+ struct mutex update_lock;
char valid; /* zero until following fields are valid */
unsigned long last_updated; /* in jiffies */
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/pc87360.c linux-2.6.15-rc5-mutex/drivers/hwmon/pc87360.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/pc87360.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/pc87360.c 2005-12-12 21:35:18.000000000 +0000
@@ -183,8 +183,8 @@ static inline u8 PWM_TO_REG(int val, int
struct pc87360_data {
struct i2c_client client;
struct class_device *class_dev;
- struct semaphore lock;
- struct semaphore update_lock;
+ struct mutex lock;
+ struct mutex update_lock;
char valid; /* !=0 if following fields are valid */
unsigned long last_updated; /* In jiffies */
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/sis5595.c linux-2.6.15-rc5-mutex/drivers/hwmon/sis5595.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/sis5595.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/sis5595.c 2005-12-12 21:36:53.000000000 +0000
@@ -167,9 +167,9 @@ static inline u8 DIV_TO_REG(int val)
struct sis5595_data {
struct i2c_client client;
struct class_device *class_dev;
- struct semaphore lock;
+ struct mutex lock;
- struct semaphore update_lock;
+ struct mutex update_lock;
char valid; /* !=0 if following fields are valid */
unsigned long last_updated; /* In jiffies */
char maxins; /* == 3 if temp enabled, otherwise == 4 */
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/smsc47b397.c linux-2.6.15-rc5-mutex/drivers/hwmon/smsc47b397.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/smsc47b397.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/smsc47b397.c 2005-12-12 21:32:47.000000000 +0000
@@ -92,9 +92,9 @@ static u8 smsc47b397_reg_temp[] = {0x25,
struct smsc47b397_data {
struct i2c_client client;
struct class_device *class_dev;
- struct semaphore lock;
+ struct mutex lock;
- struct semaphore update_lock;
+ struct mutex update_lock;
unsigned long last_updated; /* in jiffies */
int valid;
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/smsc47m1.c linux-2.6.15-rc5-mutex/drivers/hwmon/smsc47m1.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/smsc47m1.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/smsc47m1.c 2005-12-12 21:36:47.000000000 +0000
@@ -102,9 +102,9 @@ superio_exit(void)
struct smsc47m1_data {
struct i2c_client client;
struct class_device *class_dev;
- struct semaphore lock;
+ struct mutex lock;
- struct semaphore update_lock;
+ struct mutex update_lock;
unsigned long last_updated; /* In jiffies */
u8 fan[2]; /* Register value */
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/via686a.c linux-2.6.15-rc5-mutex/drivers/hwmon/via686a.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/via686a.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/via686a.c 2005-12-12 21:32:38.000000000 +0000
@@ -296,7 +296,7 @@ static inline long TEMP_FROM_REG10(u16 v
struct via686a_data {
struct i2c_client client;
struct class_device *class_dev;
- struct semaphore update_lock;
+ struct mutex update_lock;
char valid; /* !=0 if following fields are valid */
unsigned long last_updated; /* In jiffies */
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/w83627ehf.c linux-2.6.15-rc5-mutex/drivers/hwmon/w83627ehf.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/w83627ehf.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/w83627ehf.c 2005-12-12 21:36:26.000000000 +0000
@@ -177,9 +177,9 @@ temp1_to_reg(int temp)
struct w83627ehf_data {
struct i2c_client client;
struct class_device *class_dev;
- struct semaphore lock;
+ struct mutex lock;
- struct semaphore update_lock;
+ struct mutex update_lock;
char valid; /* !=0 if following fields are valid */
unsigned long last_updated; /* In jiffies */
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/w83627hf.c linux-2.6.15-rc5-mutex/drivers/hwmon/w83627hf.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/w83627hf.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/w83627hf.c 2005-12-12 21:35:50.000000000 +0000
@@ -285,10 +285,10 @@ static inline u8 DIV_TO_REG(long val)
struct w83627hf_data {
struct i2c_client client;
struct class_device *class_dev;
- struct semaphore lock;
+ struct mutex lock;
enum chips type;
- struct semaphore update_lock;
+ struct mutex update_lock;
char valid; /* !=0 if following fields are valid */
unsigned long last_updated; /* In jiffies */
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/w83781d.c linux-2.6.15-rc5-mutex/drivers/hwmon/w83781d.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/w83781d.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/w83781d.c 2005-12-12 21:34:06.000000000 +0000
@@ -221,10 +221,10 @@ DIV_TO_REG(long val, enum chips type)
struct w83781d_data {
struct i2c_client client;
struct class_device *class_dev;
- struct semaphore lock;
+ struct mutex lock;
enum chips type;
- struct semaphore update_lock;
+ struct mutex update_lock;
char valid; /* !=0 if following fields are valid */
unsigned long last_updated; /* In jiffies */
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/w83792d.c linux-2.6.15-rc5-mutex/drivers/hwmon/w83792d.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/w83792d.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/w83792d.c 2005-12-12 21:35:10.000000000 +0000
@@ -269,10 +269,10 @@ DIV_TO_REG(long val)
struct w83792d_data {
struct i2c_client client;
struct class_device *class_dev;
- struct semaphore lock;
+ struct mutex lock;
enum chips type;
- struct semaphore update_lock;
+ struct mutex update_lock;
char valid; /* !=0 if following fields are valid */
unsigned long last_updated; /* In jiffies */
diff -uNrp /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/w83l785ts.c linux-2.6.15-rc5-mutex/drivers/hwmon/w83l785ts.c
--- /warthog/kernels/linux-2.6.15-rc5/drivers/hwmon/w83l785ts.c 2005-12-08 16:23:39.000000000 +0000
+++ linux-2.6.15-rc5-mutex/drivers/hwmon/w83l785ts.c 2005-12-12 21:35:47.000000000 +0000
@@ -107,7 +107,7 @@ static struct i2c_driver w83l785ts_drive
struct w83l785ts_data {
struct i2c_client client;
struct class_device *class_dev;
- struct semaphore update_lock;
+ struct mutex update_lock;
char valid; /* zero until following fields are valid */
unsigned long last_updated; /* in jiffies */
next prev parent reply other threads:[~2005-12-12 23:51 UTC|newest]
Thread overview: 237+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-12-12 23:45 [PATCH 1/19] MUTEX: Introduce simple mutex implementation David Howells
2005-12-12 23:45 ` [PATCH 2/19] MUTEX: i386 arch mutex David Howells
2005-12-12 23:45 ` [PATCH 8/19] MUTEX: Drivers I-K changes David Howells
2005-12-12 23:45 ` David Howells [this message]
2005-12-12 23:45 ` [PATCH 6/19] MUTEX: Drivers A-E changes David Howells
2005-12-12 23:45 ` [PATCH 3/19] MUTEX: x86_64 arch mutex David Howells
2005-12-12 23:45 ` [PATCH 5/19] MUTEX: Core kernel changes David Howells
2005-12-12 23:45 ` [PATCH 4/19] MUTEX: FRV arch mutex David Howells
2005-12-12 23:45 ` [PATCH 15/19] MUTEX: Second set of include changes David Howells
2005-12-12 23:45 ` [PATCH 10/19] MUTEX: Drivers N-P changes David Howells
2005-12-12 23:45 ` [PATCH 9/19] MUTEX: Drivers L-M changes David Howells
2005-12-12 23:45 ` [PATCH 13/19] MUTEX: Filesystem changes David Howells
2005-12-12 23:45 ` [PATCH 14/19] MUTEX: First set of include changes David Howells
2005-12-12 23:45 ` [PATCH 12/19] MUTEX: Drivers T-Z changes David Howells
2005-12-12 23:45 ` [PATCH 11/19] MUTEX: Drivers Q-S changes David Howells
2005-12-12 23:45 ` [PATCH 18/19] MUTEX: Security changes David Howells
2005-12-12 23:45 ` [PATCH 17/19] MUTEX: Networking changes David Howells
2005-12-12 23:45 ` [PATCH 16/19] MUTEX: IPC changes David Howells
2005-12-12 23:45 ` [PATCH 19/19] MUTEX: Sound changes David Howells
2005-12-13 0:13 ` [PATCH 1/19] MUTEX: Introduce simple mutex implementation Nick Piggin
2005-12-13 0:19 ` Nick Piggin
2005-12-13 0:19 ` Andrew Morton
2005-12-13 7:54 ` Ingo Molnar
2005-12-13 7:58 ` Andi Kleen
2005-12-13 8:42 ` Andrew Morton
2005-12-13 8:49 ` Andi Kleen
2005-12-13 9:01 ` Andrew Morton
2005-12-13 9:01 ` Andrew Morton
2005-12-13 9:02 ` Andrew Morton
2005-12-13 10:07 ` Jakub Jelinek
2005-12-13 10:11 ` Andi Kleen
2005-12-13 10:15 ` Jakub Jelinek
2005-12-13 10:25 ` Andrew Morton
2005-12-13 10:25 ` Andrew Morton
2005-12-14 10:46 ` Russell King
2005-12-13 9:05 ` Andi Kleen
2005-12-13 9:15 ` Andrew Morton
2005-12-13 9:15 ` Andrew Morton
2005-12-13 9:24 ` Andi Kleen
2005-12-13 9:44 ` Andrew Morton
2005-12-13 9:44 ` Andrew Morton
2005-12-13 9:49 ` Andi Kleen
2005-12-13 10:28 ` Andreas Schwab
2005-12-13 10:30 ` Andi Kleen
2005-12-13 12:33 ` Matthew Wilcox
2005-12-13 22:18 ` Adrian Bunk
2005-12-13 22:25 ` Andi Kleen
2005-12-13 22:32 ` Adrian Bunk
2005-12-13 9:11 ` Ingo Molnar
2005-12-13 9:04 ` Christoph Hellwig
2005-12-13 9:13 ` Ingo Molnar
2005-12-13 10:11 ` Jakub Jelinek
2005-12-13 10:19 ` Christoph Hellwig
2005-12-13 10:27 ` Ingo Molnar
2005-12-15 4:53 ` Miles Bader
2005-12-15 5:05 ` Nick Piggin
2005-12-13 9:09 ` Ingo Molnar
2005-12-13 9:21 ` Andi Kleen
2005-12-13 16:16 ` Linus Torvalds
2005-12-13 21:56 ` Using C99 in the kernel was " Andi Kleen
2005-12-13 23:05 ` Al Viro
2005-12-13 23:41 ` Andi Kleen
2005-12-13 9:03 ` Christoph Hellwig
2005-12-13 9:14 ` Andrew Morton
2005-12-13 9:14 ` Andrew Morton
2005-12-13 9:21 ` Christoph Hellwig
2005-12-13 10:31 ` drivers/scsi/sd.c gcc-2.95.3 Alexey Dobriyan
2005-12-13 8:00 ` [PATCH 1/19] MUTEX: Introduce simple mutex implementation Arjan van de Ven
2005-12-13 9:03 ` Ingo Molnar
2005-12-13 9:09 ` Andi Kleen
2005-12-13 9:34 ` Ingo Molnar
2005-12-13 14:33 ` Mark Lord
2005-12-13 14:45 ` Arjan van de Ven
2005-12-13 9:37 ` Ingo Molnar
2005-12-13 9:19 ` Arjan van de Ven
2005-12-13 9:02 ` Christoph Hellwig
2005-12-13 9:39 ` Ingo Molnar
2005-12-13 10:00 ` Ingo Molnar
2005-12-13 17:40 ` Paul Jackson
2005-12-13 18:34 ` David Howells
2005-12-13 22:31 ` Paul Jackson
2005-12-13 22:31 ` Paul Jackson
2005-12-14 11:02 ` David Howells
2005-12-14 11:12 ` David Howells
2005-12-14 11:18 ` Alan Cox
2005-12-14 12:35 ` David Howells
2005-12-14 12:35 ` David Howells
2005-12-14 13:58 ` Thomas Gleixner
2005-12-14 23:40 ` Mark Lord
2005-12-14 23:54 ` Andrew Morton
2005-12-15 13:41 ` Nikita Danilov
2005-12-15 14:56 ` Alan Cox
2005-12-15 15:52 ` Nikita Danilov
2005-12-15 16:50 ` Christopher Friesen
2005-12-15 20:53 ` Steven Rostedt
2005-12-15 15:55 ` David Howells
2005-12-15 16:22 ` linux-os (Dick Johnson)
2005-12-15 16:22 ` linux-os (Dick Johnson)
2005-12-15 16:28 ` Linus Torvalds
2005-12-15 17:04 ` Thomas Gleixner
2005-12-15 17:09 ` Paul Jackson
2005-12-15 17:17 ` David Howells
2005-12-15 16:51 ` David Howells
2005-12-15 16:56 ` Paul Jackson
2005-12-15 16:56 ` Paul Jackson
2005-12-15 17:28 ` David Howells
2005-12-15 17:48 ` Linus Torvalds
2005-12-15 18:20 ` Nikita Danilov
2005-12-15 20:58 ` Steven Rostedt
2005-12-15 19:21 ` Andrew Morton
2005-12-15 19:38 ` Linus Torvalds
2005-12-15 20:28 ` Steven Rostedt
2005-12-15 20:32 ` Geert Uytterhoeven
2005-12-16 21:41 ` Thomas Gleixner
2005-12-16 21:41 ` Linus Torvalds
2005-12-16 22:06 ` Thomas Gleixner
2005-12-16 22:19 ` Linus Torvalds
2005-12-16 22:32 ` Steven Rostedt
2005-12-16 22:42 ` Thomas Gleixner
2005-12-16 22:41 ` Linus Torvalds
2005-12-16 22:49 ` Steven Rostedt
2005-12-16 23:29 ` Thomas Gleixner
2005-12-17 0:29 ` Joe Korty
2005-12-17 1:00 ` Linus Torvalds
2005-12-17 3:13 ` Steven Rostedt
2005-12-17 7:34 ` Linus Torvalds
2005-12-17 23:43 ` Matthew Wilcox
2005-12-18 0:05 ` Lee Revell
2005-12-18 0:21 ` Matthew Wilcox
2005-12-18 1:25 ` Lee Revell
2005-12-22 12:27 ` Bill Huey
2005-12-19 16:08 ` Ingo Molnar
2005-12-22 12:40 ` Bill Huey
2005-12-22 12:45 ` Bill Huey
2005-12-19 23:46 ` Keith Owens
2005-12-15 14:41 ` Steven Rostedt
2005-12-14 23:57 ` Thomas Gleixner
2005-12-14 23:57 ` Mark Lord
2005-12-15 0:10 ` Thomas Gleixner
2005-12-15 2:46 ` Linus Torvalds
2005-12-15 15:53 ` David Howells
2005-12-15 15:37 ` David Howells
2005-12-15 19:28 ` Andrew Morton
2005-12-15 19:28 ` Andrew Morton
2005-12-15 20:18 ` Andrew Morton
2005-12-15 21:28 ` Steven Rostedt
2005-12-16 22:02 ` Thomas Gleixner
2005-12-16 10:45 ` David Howells
2005-12-13 9:55 ` Ingo Molnar
2005-12-13 0:30 ` Arnd Bergmann
2005-12-13 0:57 ` Daniel Walker
2005-12-13 3:23 ` Steven Rostedt
2005-12-13 2:57 ` Mark Lord
2005-12-13 3:17 ` Steven Rostedt
2005-12-13 9:06 ` Christoph Hellwig
2005-12-13 9:54 ` David Howells
2005-12-13 10:13 ` Ingo Molnar
2005-12-13 10:34 ` Ingo Molnar
2005-12-13 10:37 ` Ingo Molnar
2005-12-13 12:47 ` Oliver Neukum
2005-12-13 13:09 ` Alan Cox
2005-12-13 13:13 ` Matthew Wilcox
2005-12-13 14:04 ` Alan Cox
2005-12-13 13:24 ` Oliver Neukum
2005-12-14 1:00 ` Nick Piggin
2005-12-14 10:54 ` David Howells
2005-12-14 11:17 ` Nick Piggin
2005-12-14 11:46 ` David Howells
2005-12-14 21:23 ` Nick Piggin
2005-12-16 12:00 ` David Howells
2005-12-16 13:16 ` Nick Piggin
2005-12-16 15:53 ` David Howells
2005-12-16 23:41 ` Nick Piggin
2005-12-16 16:02 ` David Howells
2005-12-13 10:48 ` David Howells
2005-12-13 12:39 ` Matthew Wilcox
2005-12-13 10:54 ` Ingo Molnar
2005-12-13 11:23 ` David Howells
2005-12-13 11:24 ` David Howells
2005-12-13 13:45 ` Ingo Molnar
2005-12-13 11:34 ` David Howells
2005-12-13 13:05 ` Alan Cox
2005-12-13 13:15 ` Alan Cox
2005-12-13 23:21 ` Nikita Danilov
2005-12-13 13:32 ` David Howells
2005-12-13 14:00 ` Alan Cox
2005-12-13 14:35 ` Christopher Friesen
2005-12-13 14:44 ` Arjan van de Ven
2005-12-13 14:59 ` Christopher Friesen
2005-12-13 15:23 ` David Howells
2005-12-15 5:24 ` Miles Bader
2005-12-13 15:39 ` David Howells
2005-12-13 16:10 ` Alan Cox
2005-12-14 10:29 ` Arjan van de Ven
2005-12-14 11:03 ` Arjan van de Ven
2005-12-14 11:03 ` Alan Cox
2005-12-14 11:08 ` Arjan van de Ven
2005-12-14 11:24 ` Alan Cox
2005-12-14 11:35 ` Andrew Morton
2005-12-14 11:44 ` Arjan van de Ven
2005-12-14 11:52 ` Andi Kleen
2005-12-14 11:55 ` Arjan van de Ven
2005-12-14 11:57 ` David Howells
2005-12-14 12:19 ` Jakub Jelinek
2005-12-16 1:54 ` Nick Piggin
2005-12-16 11:02 ` David Howells
2005-12-16 13:01 ` Nick Piggin
2005-12-16 13:21 ` Russell King
2005-12-16 13:41 ` Nick Piggin
2005-12-16 13:46 ` Linh Dang
2005-12-16 14:31 ` Russell King
2005-12-16 15:24 ` Linh Dang
2005-12-16 15:35 ` Nick Piggin
2005-12-16 15:40 ` Kyle Moffett
2005-12-16 15:49 ` Linh Dang
2005-12-16 15:46 ` David Howells
2005-12-16 15:58 ` Russell King
2005-12-17 15:57 ` Nikita Danilov
2005-12-16 16:28 ` Linus Torvalds
2005-12-16 11:30 ` David Howells
2005-12-16 16:33 ` Linus Torvalds
2005-12-16 16:33 ` Linus Torvalds
2005-12-16 22:23 ` David S. Miller
2005-12-16 22:38 ` Linus Torvalds
2005-12-16 22:53 ` David S. Miller
2005-12-17 0:41 ` Jesse Barnes
2005-12-17 7:10 ` David S. Miller
2005-12-17 7:40 ` Linus Torvalds
2005-12-17 17:22 ` Jesse Barnes
2005-12-17 17:19 ` Jesse Barnes
2005-12-17 22:38 ` Richard Henderson
2005-12-17 23:05 ` David S. Miller
2005-12-14 12:17 ` Christoph Hellwig
2005-12-14 11:42 ` Arjan van de Ven
2005-12-14 8:31 ` Ingo Molnar
2005-12-13 20:04 ` Steven Rostedt
2005-12-13 21:03 ` David Howells
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200512122345.jBCNjl4F009039@warthog.cambridge.redhat.com \
--to=dhowells@redhat.com \
--cc=akpm@osdl.org \
--cc=arjan@infradead.org \
--cc=hch@infradead.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matthew@wil.cx \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.