ASoC: AD1836: fix codec name

[deliverable/linux.git] / sound / soc / codecs / ad1836.c

diff --git a/sound/soc/codecs/ad1836.c b/sound/soc/codecs/ad1836.c
index e3a9493e3ced2022ef719eb92c25253ca75355a0..9cc6123cf7ea689fdc8bc3e22112ad8c5ac9065f 100644 (file)
--- a/sound/soc/codecs/ad1836.c
+++ b/sound/soc/codecs/ad1836.c
@@ -1,19 +1,10 @@
-/*
- * File:         sound/soc/codecs/ad1836.c
- * Author:       Barry Song <Barry.Song@analog.com>
- *
- * Created:      Aug 04 2009
- * Description:  Driver for AD1836 sound chip
- *
- * Modified:
- *               Copyright 2009 Analog Devices Inc.
+ /*
+ * Audio Codec driver supporting:
+ *  AD1835A, AD1836, AD1837A, AD1838A, AD1839A
  *
- * Bugs:         Enter bugs at http://blackfin.uclinux.org/
+ * Copyright 2009-2011 Analog Devices Inc.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Licensed under the GPL-2 or later.
  */
 
 #include <linux/init.h>
@@ -331,8 +322,8 @@ static int ad1836_remove(struct snd_soc_codec *codec)
 }
 
 static struct snd_soc_codec_driver soc_codec_dev_ad1836 = {
-       .probe =        ad1836_probe,
-       .remove =       ad1836_remove,
+       .probe = ad1836_probe,
+       .remove = ad1836_remove,
        .suspend =      ad1836_soc_suspend,
        .resume =       ad1836_soc_resume,
        .reg_cache_size = AD1836_NUM_REGS,
@@ -384,7 +375,7 @@ MODULE_DEVICE_TABLE(spi, ad1836_ids);
 
 static struct spi_driver ad1836_spi_driver = {
        .driver = {
-               .name   = "ad1836-codec",
+               .name   = "ad1836",
                .owner  = THIS_MODULE,
        },
        .probe          = ad1836_spi_probe,
@@ -394,15 +385,7 @@ static struct spi_driver ad1836_spi_driver = {
 
 static int __init ad1836_init(void)
 {
-       int ret;
-
-       ret = spi_register_driver(&ad1836_spi_driver);
-       if (ret != 0) {
-               printk(KERN_ERR "Failed to register ad1836 SPI driver: %d\n",
-                               ret);
-       }
-
-       return ret;
+       return spi_register_driver(&ad1836_spi_driver);
 }
 module_init(ad1836_init);