git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[POWERPC] Clean out a bunch of duplicate includes
[safe/jmp/linux-2.6]
/
arch
/
powerpc
/
platforms
/
powermac
/
low_i2c.c
diff --git
a/arch/powerpc/platforms/powermac/low_i2c.c
b/arch/powerpc/platforms/powermac/low_i2c.c
index
3f507ab
..
da2007e
100644
(file)
--- a/
arch/powerpc/platforms/powermac/low_i2c.c
+++ b/
arch/powerpc/platforms/powermac/low_i2c.c
@@
-40,8
+40,8
@@
#include <linux/completion.h>
#include <linux/platform_device.h>
#include <linux/interrupt.h>
#include <linux/completion.h>
#include <linux/platform_device.h>
#include <linux/interrupt.h>
-#include <linux/completion.h>
#include <linux/timer.h>
#include <linux/timer.h>
+#include <linux/mutex.h>
#include <asm/keylargo.h>
#include <asm/uninorth.h>
#include <asm/io.h>
#include <asm/keylargo.h>
#include <asm/uninorth.h>
#include <asm/io.h>
@@
-84,7
+84,7
@@
struct pmac_i2c_bus
void *hostdata;
int channel; /* some hosts have multiple */
int mode; /* current mode */
void *hostdata;
int channel; /* some hosts have multiple */
int mode; /* current mode */
- struct
semaphore sem
;
+ struct
mutex mutex
;
int opened;
int polled; /* open mode */
struct platform_device *platform_dev;
int opened;
int polled; /* open mode */
struct platform_device *platform_dev;
@@
-104,7
+104,7
@@
static LIST_HEAD(pmac_i2c_busses);
struct pmac_i2c_host_kw
{
struct pmac_i2c_host_kw
{
- struct
semaphore
mutex; /* Access mutex for use by
+ struct
mutex
mutex; /* Access mutex for use by
* i2c-keywest */
void __iomem *base; /* register base address */
int bsteps; /* register stepping */
* i2c-keywest */
void __iomem *base; /* register base address */
int bsteps; /* register stepping */
@@
-375,14
+375,14
@@
static void kw_i2c_timeout(unsigned long data)
static int kw_i2c_open(struct pmac_i2c_bus *bus)
{
struct pmac_i2c_host_kw *host = bus->hostdata;
static int kw_i2c_open(struct pmac_i2c_bus *bus)
{
struct pmac_i2c_host_kw *host = bus->hostdata;
-
down
(&host->mutex);
+
mutex_lock
(&host->mutex);
return 0;
}
static void kw_i2c_close(struct pmac_i2c_bus *bus)
{
struct pmac_i2c_host_kw *host = bus->hostdata;
return 0;
}
static void kw_i2c_close(struct pmac_i2c_bus *bus)
{
struct pmac_i2c_host_kw *host = bus->hostdata;
-
up
(&host->mutex);
+
mutex_unlock
(&host->mutex);
}
static int kw_i2c_xfer(struct pmac_i2c_bus *bus, u8 addrdir, int subsize,
}
static int kw_i2c_xfer(struct pmac_i2c_bus *bus, u8 addrdir, int subsize,
@@
-498,7
+498,7
@@
static struct pmac_i2c_host_kw *__init kw_i2c_host_init(struct device_node *np)
kfree(host);
return NULL;
}
kfree(host);
return NULL;
}
-
init_MUTEX
(&host->mutex);
+
mutex_init
(&host->mutex);
init_completion(&host->complete);
spin_lock_init(&host->lock);
init_timer(&host->timeout_timer);
init_completion(&host->complete);
spin_lock_init(&host->lock);
init_timer(&host->timeout_timer);
@@
-571,7
+571,7
@@
static void __init kw_i2c_add(struct pmac_i2c_host_kw *host,
bus->open = kw_i2c_open;
bus->close = kw_i2c_close;
bus->xfer = kw_i2c_xfer;
bus->open = kw_i2c_open;
bus->close = kw_i2c_close;
bus->xfer = kw_i2c_xfer;
-
init_MUTEX(&bus->sem
);
+
mutex_init(&bus->mutex
);
if (controller == busnode)
bus->flags = pmac_i2c_multibus;
list_add(&bus->link, &pmac_i2c_busses);
if (controller == busnode)
bus->flags = pmac_i2c_multibus;
list_add(&bus->link, &pmac_i2c_busses);
@@
-798,7
+798,7
@@
static void __init pmu_i2c_probe(void)
bus->mode = pmac_i2c_mode_std;
bus->hostdata = bus + 1;
bus->xfer = pmu_i2c_xfer;
bus->mode = pmac_i2c_mode_std;
bus->hostdata = bus + 1;
bus->xfer = pmu_i2c_xfer;
-
init_MUTEX(&bus->sem
);
+
mutex_init(&bus->mutex
);
bus->flags = pmac_i2c_multibus;
list_add(&bus->link, &pmac_i2c_busses);
bus->flags = pmac_i2c_multibus;
list_add(&bus->link, &pmac_i2c_busses);
@@
-921,7
+921,7
@@
static void __init smu_i2c_probe(void)
bus->mode = pmac_i2c_mode_std;
bus->hostdata = bus + 1;
bus->xfer = smu_i2c_xfer;
bus->mode = pmac_i2c_mode_std;
bus->hostdata = bus + 1;
bus->xfer = smu_i2c_xfer;
-
init_MUTEX(&bus->sem
);
+
mutex_init(&bus->mutex
);
bus->flags = 0;
list_add(&bus->link, &pmac_i2c_busses);
bus->flags = 0;
list_add(&bus->link, &pmac_i2c_busses);
@@
-1093,13
+1093,13
@@
int pmac_i2c_open(struct pmac_i2c_bus *bus, int polled)
{
int rc;
{
int rc;
-
down(&bus->sem
);
+
mutex_lock(&bus->mutex
);
bus->polled = polled || pmac_i2c_force_poll;
bus->opened = 1;
bus->mode = pmac_i2c_mode_std;
if (bus->open && (rc = bus->open(bus)) != 0) {
bus->opened = 0;
bus->polled = polled || pmac_i2c_force_poll;
bus->opened = 1;
bus->mode = pmac_i2c_mode_std;
if (bus->open && (rc = bus->open(bus)) != 0) {
bus->opened = 0;
-
up(&bus->sem
);
+
mutex_unlock(&bus->mutex
);
return rc;
}
return 0;
return rc;
}
return 0;
@@
-1112,7
+1112,7
@@
void pmac_i2c_close(struct pmac_i2c_bus *bus)
if (bus->close)
bus->close(bus);
bus->opened = 0;
if (bus->close)
bus->close(bus);
bus->opened = 0;
-
up(&bus->sem
);
+
mutex_unlock(&bus->mutex
);
}
EXPORT_SYMBOL_GPL(pmac_i2c_close);
}
EXPORT_SYMBOL_GPL(pmac_i2c_close);