ASoC: Remove unneeded use of spi_bus_type
[linux-2.6.git] / sound / soc / codecs / wm8985.c
index b94af96..ae9020a 100644 (file)
@@ -185,8 +185,8 @@ static const SOC_ENUM_SINGLE_DECL(filter_mode, WM8985_ADC_CONTROL, 7,
 
 static const char *eq_bw_text[] = { "Narrow", "Wide" };
 static const char *eqmode_text[] = { "Capture", "Playback" };
-static const SOC_ENUM_SINGLE_DECL(eqmode, WM8985_EQ1_LOW_SHELF, 8,
-                                 eqmode_text);
+static const SOC_ENUM_SINGLE_EXT_DECL(eqmode, eqmode_text);
+
 static const char *eq1_cutoff_text[] = {
        "80Hz", "105Hz", "135Hz", "175Hz"
 };
@@ -644,7 +644,7 @@ static int wm8985_hw_params(struct snd_pcm_substream *substream,
                            struct snd_pcm_hw_params *params,
                            struct snd_soc_dai *dai)
 {
-       size_t i;
+       int i;
        struct snd_soc_codec *codec;
        struct wm8985_priv *wm8985;
        u16 blen, srate_idx;
@@ -1102,7 +1102,6 @@ static int __devexit wm8985_spi_remove(struct spi_device *spi)
 static struct spi_driver wm8985_spi_driver = {
        .driver = {
                .name = "wm8985",
-               .bus = &spi_bus_type,
                .owner = THIS_MODULE,
        },
        .probe = wm8985_spi_probe,