X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sound%2Fi2c%2Fi2c.c;fp=sound%2Fi2c%2Fi2c.c;h=c4e1f2c23ced404a2202b83fc2ddbe0188869d7d;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=b60fb1892828c92e0fd8b7aab4fe5ba0c1c7243b;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git diff --git a/sound/i2c/i2c.c b/sound/i2c/i2c.c index b60fb1892..c4e1f2c23 100644 --- 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; - mutex_init(&bus->lock_mutex); + init_MUTEX(&bus->lock_mutex); 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; } -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) { @@ -126,8 +124,6 @@ int snd_i2c_device_create(struct snd_i2c_bus *bus, const char *name, return 0; } -EXPORT_SYMBOL(snd_i2c_device_create); - 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; } -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); } -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); } -EXPORT_SYMBOL(snd_i2c_readbytes); - 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 */ @@ -331,6 +320,12 @@ static int snd_i2c_bit_probeaddr(struct snd_i2c_bus *bus, unsigned short addr) 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) {