5 files changed, 8 insertions, 9 deletions

diff --git a/sound/aoa/codecs/snd-aoa-codec-onyx.c b/sound/aoa/codecs/snd-aoa-codec-onyx.c
index e91f9f66f395..ded516717940 100644
--- a/sound/aoa/codecs/snd-aoa-codec-onyx.c
+++ b/sound/aoa/codecs/snd-aoa-codec-onyx.c
@@ -1018,7 +1018,7 @@ static int onyx_create(struct i2c_adapter *adapter,
         onyx->i2c.driver = &onyx_driver;
         onyx->i2c.adapter = adapter;
         onyx->i2c.addr = addr & 0x7f;
-        strlcpy(onyx->i2c.name, "onyx audio codec", I2C_NAME_SIZE-1);
+        strlcpy(onyx->i2c.name, "onyx audio codec", I2C_NAME_SIZE);
 
         if (i2c_attach_client(&onyx->i2c)) {
                 printk(KERN_ERR PFX "failed to attach to i2c\n");
@@ -1033,7 +1033,7 @@ static int onyx_create(struct i2c_adapter *adapter,
                 goto fail;
         }
 
-        strlcpy(onyx->codec.name, "onyx", MAX_CODEC_NAME_LEN-1);
+        strlcpy(onyx->codec.name, "onyx", MAX_CODEC_NAME_LEN);
         onyx->codec.owner = THIS_MODULE;
         onyx->codec.init = onyx_init_codec;
         onyx->codec.exit = onyx_exit_codec;
diff --git a/sound/aoa/codecs/snd-aoa-codec-tas.c b/sound/aoa/codecs/snd-aoa-codec-tas.c
index 041fe52cbf29..2f771f57c76f 100644
--- a/sound/aoa/codecs/snd-aoa-codec-tas.c
+++ b/sound/aoa/codecs/snd-aoa-codec-tas.c
@@ -899,14 +899,14 @@ static int tas_create(struct i2c_adapter *adapter,
         tas->i2c.addr = addr;
         /* seems that half is a saner default */
         tas->drc_range = TAS3004_DRC_MAX / 2;
-        strlcpy(tas->i2c.name, "tas audio codec", I2C_NAME_SIZE-1);
+        strlcpy(tas->i2c.name, "tas audio codec", I2C_NAME_SIZE);
 
         if (i2c_attach_client(&tas->i2c)) {
                 printk(KERN_ERR PFX "failed to attach to i2c\n");
                 goto fail;
         }
 
-        strlcpy(tas->codec.name, "tas", MAX_CODEC_NAME_LEN-1);
+        strlcpy(tas->codec.name, "tas", MAX_CODEC_NAME_LEN);
         tas->codec.owner = THIS_MODULE;
         tas->codec.init = tas_init_codec;
         tas->codec.exit = tas_exit_codec;
diff --git a/sound/aoa/soundbus/core.c b/sound/aoa/soundbus/core.c
index 8b2e9b905cda..64d163914335 100644
--- a/sound/aoa/soundbus/core.c
+++ b/sound/aoa/soundbus/core.c
@@ -163,8 +163,6 @@ static int soundbus_device_resume(struct device * dev)
 
 #endif /* CONFIG_PM */
 
-extern struct device_attribute soundbus_dev_attrs[];
-
 static struct bus_type soundbus_bus_type = {
         .name           = "aoa-soundbus",
         .probe          = soundbus_probe,
diff --git a/sound/aoa/soundbus/i2sbus/i2sbus-core.c b/sound/aoa/soundbus/i2sbus/i2sbus-core.c
index 0fccdbf51663..efb9441b3acf 100644
--- a/sound/aoa/soundbus/i2sbus/i2sbus-core.c
+++ b/sound/aoa/soundbus/i2sbus/i2sbus-core.c
@@ -23,9 +23,6 @@
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>");
 MODULE_DESCRIPTION("Apple Soundbus: I2S support");
-/* for auto-loading, declare that we handle this weird
- * string that macio puts into the relevant device */
-MODULE_ALIAS("of:Ni2sTi2sC");
 
 static int force;
 module_param(force, int, 0444);
@@ -37,6 +34,8 @@ static struct of_device_id i2sbus_match[] = {
         { }
 };
 
+MODULE_DEVICE_TABLE(of, i2sbus_match);
+
 static int alloc_dbdma_descriptor_ring(struct i2sbus_dev *i2sdev,
                                        struct dbdma_command_mem *r,
                                        int numcmds)
diff --git a/sound/aoa/soundbus/soundbus.h b/sound/aoa/soundbus/soundbus.h
index 5c27297835d7..622cd37a0118 100644
--- a/sound/aoa/soundbus/soundbus.h
+++ b/sound/aoa/soundbus/soundbus.h
@@ -199,4 +199,6 @@ struct soundbus_driver {
 extern int soundbus_register_driver(struct soundbus_driver *drv);
 extern void soundbus_unregister_driver(struct soundbus_driver *drv);
 
+extern struct device_attribute soundbus_dev_attrs[];
+
 #endif /* __SOUNDBUS_H */