git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
sound
/
i2c
/
i2c.c
diff --git
a/sound/i2c/i2c.c
b/sound/i2c/i2c.c
index
b60fb18
..
c4e1f2c
100644
(file)
--- a/
sound/i2c/i2c.c
+++ b/
sound/i2c/i2c.c
@@
-88,7
+88,7
@@
int snd_i2c_bus_create(struct snd_card *card, const char *name,
bus = kzalloc(sizeof(*bus), GFP_KERNEL);
if (bus == NULL)
return -ENOMEM;
bus = kzalloc(sizeof(*bus), GFP_KERNEL);
if (bus == NULL)
return -ENOMEM;
-
mutex_init
(&bus->lock_mutex);
+
init_MUTEX
(&bus->lock_mutex);
INIT_LIST_HEAD(&bus->devices);
INIT_LIST_HEAD(&bus->buses);
bus->card = card;
INIT_LIST_HEAD(&bus->devices);
INIT_LIST_HEAD(&bus->buses);
bus->card = card;
@@
-106,8
+106,6
@@
int snd_i2c_bus_create(struct snd_card *card, const char *name,
return 0;
}
return 0;
}
-EXPORT_SYMBOL(snd_i2c_bus_create);
-
int snd_i2c_device_create(struct snd_i2c_bus *bus, const char *name,
unsigned char addr, struct snd_i2c_device **rdevice)
{
int snd_i2c_device_create(struct snd_i2c_bus *bus, const char *name,
unsigned char addr, struct snd_i2c_device **rdevice)
{
@@
-126,8
+124,6
@@
int snd_i2c_device_create(struct snd_i2c_bus *bus, const char *name,
return 0;
}
return 0;
}
-EXPORT_SYMBOL(snd_i2c_device_create);
-
int snd_i2c_device_free(struct snd_i2c_device *device)
{
if (device->bus)
int snd_i2c_device_free(struct snd_i2c_device *device)
{
if (device->bus)
@@
-138,29
+134,22
@@
int snd_i2c_device_free(struct snd_i2c_device *device)
return 0;
}
return 0;
}
-EXPORT_SYMBOL(snd_i2c_device_free);
-
int snd_i2c_sendbytes(struct snd_i2c_device *device, unsigned char *bytes, int count)
{
return device->bus->ops->sendbytes(device, bytes, count);
}
int snd_i2c_sendbytes(struct snd_i2c_device *device, unsigned char *bytes, int count)
{
return device->bus->ops->sendbytes(device, bytes, count);
}
-EXPORT_SYMBOL(snd_i2c_sendbytes);
int snd_i2c_readbytes(struct snd_i2c_device *device, unsigned char *bytes, int count)
{
return device->bus->ops->readbytes(device, bytes, count);
}
int snd_i2c_readbytes(struct snd_i2c_device *device, unsigned char *bytes, int count)
{
return device->bus->ops->readbytes(device, bytes, count);
}
-EXPORT_SYMBOL(snd_i2c_readbytes);
-
int snd_i2c_probeaddr(struct snd_i2c_bus *bus, unsigned short addr)
{
return bus->ops->probeaddr(bus, addr);
}
int snd_i2c_probeaddr(struct snd_i2c_bus *bus, unsigned short addr)
{
return bus->ops->probeaddr(bus, addr);
}
-EXPORT_SYMBOL(snd_i2c_probeaddr);
-
/*
* bit-operations
*/
/*
* bit-operations
*/
@@
-331,6
+320,12
@@
static int snd_i2c_bit_probeaddr(struct snd_i2c_bus *bus, unsigned short addr)
return err;
}
return err;
}
+EXPORT_SYMBOL(snd_i2c_bus_create);
+EXPORT_SYMBOL(snd_i2c_device_create);
+EXPORT_SYMBOL(snd_i2c_device_free);
+EXPORT_SYMBOL(snd_i2c_sendbytes);
+EXPORT_SYMBOL(snd_i2c_readbytes);
+EXPORT_SYMBOL(snd_i2c_probeaddr);
static int __init alsa_i2c_init(void)
{
static int __init alsa_i2c_init(void)
{