leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: Updates for v3.8

Browse Source 
Some incremental updates, nothing too exciting.  The biggest block here
 is the __dev annotation removal stuff from Bill, everything else is the
 usual driver-specific stuff - a combination of fixes and development.
 
 There will be at least more more set of fixes to come but I wanted to
 get these out ready for the merge window to make sure Bill's stuff makes
 it in.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIcBAABAgAGBQJQxK9SAAoJELSic+t+oim9MNEP/RzdU9/vHK2xeZ8O7SsIC4T+
 TMIzNLNyjMGA8qOJXmd5iwdTE/Cxh7OEYJvG/qUony8XipjdGC6V4e+Ybbl55Kc8
 mf/5fytyTX3+1eZ0uYHVrTMGcSfZ7qelmUXbIASo4jiqZUm2Uo/jar10Omy5EG/J
 mn7dtt67bOoiWugMhBEeKslwDSOQFBL2qcMbkWVRfqpvCLPqT7gg12OfQbrfb/ZV
 Ucj9zVMblel3ziWkElKxgm1Sfo60ExyekbnR11yLlSe8NfX6ky+46lUj3SEwCIzv
 8sknZYwGdGgb0bgNMzeqwUtPS1smCH46/5UVul6of9ox9DafKklfu01jdRg27zTj
 c95YQDDw3CtQap8FXjKIB5pn3zRl8pK7zYllZdEdUF0tYhaFSrCt566nXLfuZ3Fq
 jVkpwQe4u/oCmDlBpZUGlzyv0Vo7xarm79q2RYvgpNPN310mlufKjcJyhm5kAxdp
 6RTKcxtW6IrB8r5MmkBcyLiRoVjt/3e1dK0lOgp66NjSmo+GPSi7Yf4KKjTS6dDL
 kJ8Tiv9xI2daY0ZKwNu/3ifQPx3c2KLw9aoEb/R9RMe+LbulZu8DJcm0xpc1jYWP
 x63MSLfYwCO373dIuobv7O4PuI5hu11tArIYosBuq2vUuyQ9ymqGdsquYMXM10DA
 FKHsSz3oC3jMr4nhsUyt
 =Ywvf
 -----END PGP SIGNATURE-----

Merge tag 'asoc-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: Updates for v3.8

Some incremental updates, nothing too exciting.  The biggest block here
is the __dev annotation removal stuff from Bill, everything else is the
usual driver-specific stuff - a combination of fixes and development.

There will be at least more more set of fixes to come but I wanted to
get these out ready for the merge window to make sure Bill's stuff makes
it in.
This commit is contained in:
Takashi Iwai 2012-12-10 09:00:45 +01:00
commit 97768a8e65
267 changed files with 1175 additions and 1048 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-exynos/mach-armlex4210.c
View File

@ -147,7 +147,6 @@ static struct platform_device *armlex4210_devices[] __initdata = {
&s3c_device_hsmmc3,
&s3c_device_rtc,
&s3c_device_wdt,
&samsung_asoc_dma,
&armlex4210_smsc911x,
&exynos4_device_ahci,
};

1
arch/arm/mach-exynos/mach-smdkv310.c
View File

@ -311,7 +311,6 @@ static struct platform_device *smdkv310_devices[] __initdata = {
&s5p_device_mfc_l,
&s5p_device_mfc_r,
&exynos4_device_spdif,
&samsung_asoc_dma,
&samsung_asoc_idma,
&s5p_device_fimd0,
&smdkv310_device_audio,

1
arch/arm/mach-s3c24xx/mach-gta02.c
View File

@ -521,7 +521,6 @@ static struct platform_device *gta02_devices[] __initdata = {
&gta02_nor_flash,
&s3c24xx_pwm_device,
&s3c_device_iis,
&samsung_asoc_dma,
&s3c_device_i2c0,
&gta02_dfbmcs320_device,
&gta02_buttons_device,

1
arch/arm/mach-s3c24xx/mach-h1940.c
View File

@ -632,7 +632,6 @@ static struct platform_device *h1940_devices[] __initdata = {
&s3c_device_wdt,
&s3c_device_i2c0,
&s3c_device_iis,
&samsung_asoc_dma,
&s3c_device_usbgadget,
&h1940_device_leds,
&h1940_device_bluetooth,

1
arch/arm/mach-s3c24xx/mach-mini2440.c
View File

@ -519,7 +519,6 @@ static struct platform_device *mini2440_devices[] __initdata = {
&s3c_device_iis,
&uda1340_codec,
&mini2440_audio,
&samsung_asoc_dma,
};
static void __init mini2440_map_io(void)

1
arch/arm/mach-s3c24xx/mach-rx1950.c
View File

@ -712,7 +712,6 @@ static struct platform_device *rx1950_devices[] __initdata = {
&s3c_device_wdt,
&s3c_device_i2c0,
&s3c_device_iis,
&samsung_asoc_dma,
&s3c_device_usbgadget,
&s3c_device_rtc,
&s3c_device_nand,

1
arch/arm/mach-s3c64xx/mach-crag6410.c
View File

@ -357,7 +357,6 @@ static struct platform_device *crag6410_devices[] __initdata = {
&s3c_device_timer[0],
&s3c64xx_device_iis0,
&s3c64xx_device_iis1,
&samsung_asoc_dma,
&samsung_device_keypad,
&crag6410_gpio_keydev,
&crag6410_dm9k_device,

1
arch/arm/mach-s3c64xx/mach-smdk6410.c
View File

@ -275,7 +275,6 @@ static struct platform_device *smdk6410_devices[] __initdata = {
&s3c_device_fb,
&s3c_device_ohci,
&s3c_device_usb_hsotg,
&samsung_asoc_dma,
&s3c64xx_device_iisv4,
&samsung_device_keypad,

1
arch/arm/mach-s5p64x0/mach-smdk6440.c
View File

@ -165,7 +165,6 @@ static struct platform_device *smdk6440_devices[] __initdata = {
&s3c_device_i2c1,
&s3c_device_ts,
&s3c_device_wdt,
&samsung_asoc_dma,
&s5p6440_device_iis,
&s3c_device_fb,
&smdk6440_lcd_lte480wv,

1
arch/arm/mach-s5p64x0/mach-smdk6450.c
View File

@ -183,7 +183,6 @@ static struct platform_device *smdk6450_devices[] __initdata = {
&s3c_device_i2c1,
&s3c_device_ts,
&s3c_device_wdt,
&samsung_asoc_dma,
&s5p6450_device_iis0,
&s3c_device_fb,
&smdk6450_lcd_lte480wv,

1
arch/arm/mach-s5pc100/mach-smdkc100.c
View File

@ -197,7 +197,6 @@ static struct platform_device *smdkc100_devices[] __initdata = {
&s3c_device_ts,
&s3c_device_wdt,
&smdkc100_lcd_powerdev,
&samsung_asoc_dma,
&s5pc100_device_iis0,
&samsung_device_keypad,
&s5pc100_device_ac97,

1
arch/arm/mach-s5pv210/mach-smdkc110.c
View File

@ -85,7 +85,6 @@ static struct s3c_ide_platdata smdkc110_ide_pdata __initdata = {
};
static struct platform_device *smdkc110_devices[] __initdata = {
&samsung_asoc_dma,
&s5pv210_device_iis0,
&s5pv210_device_ac97,
&s5pv210_device_spdif,

1
arch/arm/mach-s5pv210/mach-smdkv210.c
View File

@ -234,7 +234,6 @@ static struct platform_device *smdkv210_devices[] __initdata = {
&s5pv210_device_ac97,
&s5pv210_device_iis0,
&s5pv210_device_spdif,
&samsung_asoc_dma,
&samsung_asoc_idma,
&samsung_device_keypad,
&smdkv210_dm9000,

9
arch/arm/plat-samsung/devs.c
View File

@ -146,15 +146,6 @@ struct platform_device s3c_device_camif = {
/* ASOC DMA */
struct platform_device samsung_asoc_dma = {
.name = "samsung-audio",
.id = -1,
.dev = {
.dma_mask = &samsung_device_dma_mask,
.coherent_dma_mask = DMA_BIT_MASK(32),
}
};
struct platform_device samsung_asoc_idma = {
.name = "samsung-idma",
.id = -1,

1
arch/arm/plat-samsung/include/plat/devs.h
View File

@ -135,7 +135,6 @@ extern struct platform_device exynos4_device_spdif;
extern struct platform_device exynos_device_drm;
extern struct platform_device samsung_asoc_dma;
extern struct platform_device samsung_asoc_idma;
extern struct platform_device samsung_device_keypad;

1
include/linux/platform_data/davinci_asp.h
View File

@ -23,7 +23,6 @@ struct snd_platform_data {
u32 rx_dma_offset;
int asp_chan_q; /* event queue number for ASP channel */
int ram_chan_q; /* event queue number for RAM channel */
unsigned int codec_fmt;
/*
* Allowing this is more efficient and eliminates left and right swaps
* caused by underruns, but will swap the left and right channels

26
include/linux/platform_data/omap-twl4030.h
View File

@ -25,8 +25,34 @@
#ifndef _OMAP_TWL4030_H_
#define _OMAP_TWL4030_H_
/* To select if only one channel is connected in a stereo port */
#define OMAP_TWL4030_LEFT (1 << 0)
#define OMAP_TWL4030_RIGHT (1 << 1)
struct omap_tw4030_pdata {
const char *card_name;
/* Voice port is connected to McBSP3 */
bool voice_connected;
/* The driver will parse the connection flags if this flag is set */
bool custom_routing;
/* Flags to indicate connected audio ports. */
u8 has_hs;
u8 has_hf;
u8 has_predriv;
u8 has_carkit;
bool has_ear;
bool has_mainmic;
bool has_submic;
bool has_hsmic;
bool has_carkitmic;
bool has_digimic0;
bool has_digimic1;
u8 has_linein;
/* Jack detect GPIO or <= 0 if it is not implemented */
int jack_detect;
};
#endif /* _OMAP_TWL4030_H_ */

6
sound/soc/atmel/sam9g20_wm8731.c
View File

@ -197,7 +197,7 @@ static struct snd_soc_card snd_soc_at91sam9g20ek = {
.set_bias_level = at91sam9g20ek_set_bias_level,
};
static int __devinit at91sam9g20ek_audio_probe(struct platform_device *pdev)
static int at91sam9g20ek_audio_probe(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node;
struct device_node *codec_np, *cpu_np;
@ -301,7 +301,7 @@ err:
return ret;
}
static int __devexit at91sam9g20ek_audio_remove(struct platform_device *pdev)
static int at91sam9g20ek_audio_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);
@ -328,7 +328,7 @@ static struct platform_driver at91sam9g20ek_audio_driver = {
.of_match_table = of_match_ptr(at91sam9g20ek_wm8731_dt_ids),
},
.probe = at91sam9g20ek_audio_probe,
.remove = __devexit_p(at91sam9g20ek_audio_remove),
.remove = at91sam9g20ek_audio_remove,
};
module_platform_driver(at91sam9g20ek_audio_driver);

6
sound/soc/au1x/ac97c.c
View File

@ -223,7 +223,7 @@ static struct snd_soc_dai_driver au1xac97c_dai_driver = {
.ops = &alchemy_ac97c_ops,
};
static int __devinit au1xac97c_drvprobe(struct platform_device *pdev)
static int au1xac97c_drvprobe(struct platform_device *pdev)
{
int ret;
struct resource *iores, *dmares;
@ -276,7 +276,7 @@ static int __devinit au1xac97c_drvprobe(struct platform_device *pdev)
return 0;
}
static int __devexit au1xac97c_drvremove(struct platform_device *pdev)
static int au1xac97c_drvremove(struct platform_device *pdev)
{
struct au1xpsc_audio_data *ctx = platform_get_drvdata(pdev);
@ -330,7 +330,7 @@ static struct platform_driver au1xac97c_driver = {
.pm = AU1XPSCAC97_PMOPS,
},
.probe = au1xac97c_drvprobe,
.remove = __devexit_p(au1xac97c_drvremove),
.remove = au1xac97c_drvremove,
};
static int __init au1xac97c_load(void)

6
sound/soc/au1x/db1000.c
View File

@ -34,14 +34,14 @@ static struct snd_soc_card db1000_ac97 = {
.num_links = 1,
};
static int __devinit db1000_audio_probe(struct platform_device *pdev)
static int db1000_audio_probe(struct platform_device *pdev)
{
struct snd_soc_card *card = &db1000_ac97;
card->dev = &pdev->dev;
return snd_soc_register_card(card);
}
static int __devexit db1000_audio_remove(struct platform_device *pdev)
static int db1000_audio_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);
snd_soc_unregister_card(card);
@ -55,7 +55,7 @@ static struct platform_driver db1000_audio_driver = {
.pm = &snd_soc_pm_ops,
},
.probe = db1000_audio_probe,
.remove = __devexit_p(db1000_audio_remove),
.remove = db1000_audio_remove,
};
module_platform_driver(db1000_audio_driver);

8
sound/soc/au1x/db1200.c
View File

@ -167,7 +167,7 @@ static struct snd_soc_card db1550_i2s_machine = {
/*------------------------- COMMON PART ---------------------------*/
static struct snd_soc_card *db1200_cards[] __devinitdata = {
static struct snd_soc_card *db1200_cards[] = {
&db1200_ac97_machine,
&db1200_i2s_machine,
&db1300_ac97_machine,
@ -176,7 +176,7 @@ static struct snd_soc_card *db1200_cards[] __devinitdata = {
&db1550_i2s_machine,
};
static int __devinit db1200_audio_probe(struct platform_device *pdev)
static int db1200_audio_probe(struct platform_device *pdev)
{
const struct platform_device_id *pid = platform_get_device_id(pdev);
struct snd_soc_card *card;
@ -186,7 +186,7 @@ static int __devinit db1200_audio_probe(struct platform_device *pdev)
return snd_soc_register_card(card);
}
static int __devexit db1200_audio_remove(struct platform_device *pdev)
static int db1200_audio_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);
snd_soc_unregister_card(card);
@ -201,7 +201,7 @@ static struct platform_driver db1200_audio_driver = {
},
.id_table = db1200_pids,
.probe = db1200_audio_probe,
.remove = __devexit_p(db1200_audio_remove),
.remove = db1200_audio_remove,
};
module_platform_driver(db1200_audio_driver);

6
sound/soc/au1x/dbdma2.c
View File

@ -347,7 +347,7 @@ static struct snd_soc_platform_driver au1xpsc_soc_platform = {
.pcm_free = au1xpsc_pcm_free_dma_buffers,
};
static int __devinit au1xpsc_pcm_drvprobe(struct platform_device *pdev)
static int au1xpsc_pcm_drvprobe(struct platform_device *pdev)
{
struct au1xpsc_audio_dmadata *dmadata;
@ -362,7 +362,7 @@ static int __devinit au1xpsc_pcm_drvprobe(struct platform_device *pdev)
return snd_soc_register_platform(&pdev->dev, &au1xpsc_soc_platform);
}
static int __devexit au1xpsc_pcm_drvremove(struct platform_device *pdev)
static int au1xpsc_pcm_drvremove(struct platform_device *pdev)
{
snd_soc_unregister_platform(&pdev->dev);
@ -375,7 +375,7 @@ static struct platform_driver au1xpsc_pcm_driver = {
.owner = THIS_MODULE,
},
.probe = au1xpsc_pcm_drvprobe,
.remove = __devexit_p(au1xpsc_pcm_drvremove),
.remove = au1xpsc_pcm_drvremove,
};
module_platform_driver(au1xpsc_pcm_driver);

6
sound/soc/au1x/dma.c
View File

@ -322,7 +322,7 @@ static struct snd_soc_platform_driver alchemy_pcm_soc_platform = {
.pcm_free = alchemy_pcm_free_dma_buffers,
};
static int __devinit alchemy_pcm_drvprobe(struct platform_device *pdev)
static int alchemy_pcm_drvprobe(struct platform_device *pdev)
{
struct alchemy_pcm_ctx *ctx;
@ -335,7 +335,7 @@ static int __devinit alchemy_pcm_drvprobe(struct platform_device *pdev)
return snd_soc_register_platform(&pdev->dev, &alchemy_pcm_soc_platform);
}
static int __devexit alchemy_pcm_drvremove(struct platform_device *pdev)
static int alchemy_pcm_drvremove(struct platform_device *pdev)
{
snd_soc_unregister_platform(&pdev->dev);
@ -348,7 +348,7 @@ static struct platform_driver alchemy_pcmdma_driver = {
.owner = THIS_MODULE,
},
.probe = alchemy_pcm_drvprobe,
.remove = __devexit_p(alchemy_pcm_drvremove),
.remove = alchemy_pcm_drvremove,
};
module_platform_driver(alchemy_pcmdma_driver);

6
sound/soc/au1x/i2sc.c
View File

@ -225,7 +225,7 @@ static struct snd_soc_dai_driver au1xi2s_dai_driver = {
.ops = &au1xi2s_dai_ops,
};
static int __devinit au1xi2s_drvprobe(struct platform_device *pdev)
static int au1xi2s_drvprobe(struct platform_device *pdev)
{
struct resource *iores, *dmares;
struct au1xpsc_audio_data *ctx;
@ -263,7 +263,7 @@ static int __devinit au1xi2s_drvprobe(struct platform_device *pdev)
return snd_soc_register_dai(&pdev->dev, &au1xi2s_dai_driver);
}
static int __devexit au1xi2s_drvremove(struct platform_device *pdev)
static int au1xi2s_drvremove(struct platform_device *pdev)
{
struct au1xpsc_audio_data *ctx = platform_get_drvdata(pdev);
@ -309,7 +309,7 @@ static struct platform_driver au1xi2s_driver = {
.pm = AU1XI2SC_PMOPS,
},
.probe = au1xi2s_drvprobe,
.remove = __devexit_p(au1xi2s_drvremove),
.remove = au1xi2s_drvremove,
};
module_platform_driver(au1xi2s_driver);

6
sound/soc/au1x/psc-ac97.c
View File

@ -361,7 +361,7 @@ static const struct snd_soc_dai_driver au1xpsc_ac97_dai_template = {
.ops = &au1xpsc_ac97_dai_ops,
};
static int __devinit au1xpsc_ac97_drvprobe(struct platform_device *pdev)
static int au1xpsc_ac97_drvprobe(struct platform_device *pdev)
{
int ret;
struct resource *iores, *dmares;
@ -427,7 +427,7 @@ static int __devinit au1xpsc_ac97_drvprobe(struct platform_device *pdev)
return 0;
}
static int __devexit au1xpsc_ac97_drvremove(struct platform_device *pdev)
static int au1xpsc_ac97_drvremove(struct platform_device *pdev)
{
struct au1xpsc_audio_data *wd = platform_get_drvdata(pdev);
@ -495,7 +495,7 @@ static struct platform_driver au1xpsc_ac97_driver = {
.pm = AU1XPSCAC97_PMOPS,
},
.probe = au1xpsc_ac97_drvprobe,
.remove = __devexit_p(au1xpsc_ac97_drvremove),
.remove = au1xpsc_ac97_drvremove,
};
static int __init au1xpsc_ac97_load(void)

6
sound/soc/au1x/psc-i2s.c
View File

@ -288,7 +288,7 @@ static const struct snd_soc_dai_driver au1xpsc_i2s_dai_template = {
.ops = &au1xpsc_i2s_dai_ops,
};
static int __devinit au1xpsc_i2s_drvprobe(struct platform_device *pdev)
static int au1xpsc_i2s_drvprobe(struct platform_device *pdev)
{
struct resource *iores, *dmares;
unsigned long sel;
@ -353,7 +353,7 @@ static int __devinit au1xpsc_i2s_drvprobe(struct platform_device *pdev)
return snd_soc_register_dai(&pdev->dev, &wd->dai_drv);
}
static int __devexit au1xpsc_i2s_drvremove(struct platform_device *pdev)
static int au1xpsc_i2s_drvremove(struct platform_device *pdev)
{
struct au1xpsc_audio_data *wd = platform_get_drvdata(pdev);
@ -418,7 +418,7 @@ static struct platform_driver au1xpsc_i2s_driver = {
.pm = AU1XPSCI2S_PMOPS,
},
.probe = au1xpsc_i2s_drvprobe,
.remove = __devexit_p(au1xpsc_i2s_drvremove),
.remove = au1xpsc_i2s_drvremove,
};
module_platform_driver(au1xpsc_i2s_driver);

6
sound/soc/blackfin/bf5xx-ac97-pcm.c
View File

@ -453,12 +453,12 @@ static struct snd_soc_platform_driver bf5xx_ac97_soc_platform = {
.pcm_free = bf5xx_pcm_free_dma_buffers,
};
static int __devinit bf5xx_soc_platform_probe(struct platform_device *pdev)
static int bf5xx_soc_platform_probe(struct platform_device *pdev)
{
return snd_soc_register_platform(&pdev->dev, &bf5xx_ac97_soc_platform);
}
static int __devexit bf5xx_soc_platform_remove(struct platform_device *pdev)
static int bf5xx_soc_platform_remove(struct platform_device *pdev)
{
snd_soc_unregister_platform(&pdev->dev);
return 0;
@ -471,7 +471,7 @@ static struct platform_driver bf5xx_pcm_driver = {
},
.probe = bf5xx_soc_platform_probe,
.remove = __devexit_p(bf5xx_soc_platform_remove),
.remove = bf5xx_soc_platform_remove,
};
module_platform_driver(bf5xx_pcm_driver);

6
sound/soc/blackfin/bf5xx-ac97.c
View File

@ -282,7 +282,7 @@ static struct snd_soc_dai_driver bfin_ac97_dai = {
.formats = SNDRV_PCM_FMTBIT_S16_LE, },
};
static int __devinit asoc_bfin_ac97_probe(struct platform_device *pdev)
static int asoc_bfin_ac97_probe(struct platform_device *pdev)
{
struct sport_device *sport_handle;
int ret;
@ -352,7 +352,7 @@ gpio_err:
return ret;
}
static int __devexit asoc_bfin_ac97_remove(struct platform_device *pdev)
static int asoc_bfin_ac97_remove(struct platform_device *pdev)
{
struct sport_device *sport_handle = platform_get_drvdata(pdev);
@ -372,7 +372,7 @@ static struct platform_driver asoc_bfin_ac97_driver = {
},
.probe = asoc_bfin_ac97_probe,
.remove = __devexit_p(asoc_bfin_ac97_remove),
.remove = asoc_bfin_ac97_remove,
};
module_platform_driver(asoc_bfin_ac97_driver);

6
sound/soc/blackfin/bf5xx-ad1836.c
View File

@ -75,7 +75,7 @@ static struct snd_soc_card bf5xx_ad1836 = {
.num_links = 1,
};
static __devinit int bf5xx_ad1836_driver_probe(struct platform_device *pdev)
static int bf5xx_ad1836_driver_probe(struct platform_device *pdev)
{
struct snd_soc_card *card = &bf5xx_ad1836;
const char **link_name;
@ -98,7 +98,7 @@ static __devinit int bf5xx_ad1836_driver_probe(struct platform_device *pdev)
return ret;
}
static int __devexit bf5xx_ad1836_driver_remove(struct platform_device *pdev)
static int bf5xx_ad1836_driver_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);
@ -113,7 +113,7 @@ static struct platform_driver bf5xx_ad1836_driver = {
.pm = &snd_soc_pm_ops,
},
.probe = bf5xx_ad1836_driver_probe,
.remove = __devexit_p(bf5xx_ad1836_driver_remove),
.remove = bf5xx_ad1836_driver_remove,
};
module_platform_driver(bf5xx_ad1836_driver);

6
sound/soc/blackfin/bf5xx-i2s-pcm.c
View File

@ -292,12 +292,12 @@ static struct snd_soc_platform_driver bf5xx_i2s_soc_platform = {
.pcm_free = bf5xx_pcm_free_dma_buffers,
};
static int __devinit bfin_i2s_soc_platform_probe(struct platform_device *pdev)
static int bfin_i2s_soc_platform_probe(struct platform_device *pdev)
{
return snd_soc_register_platform(&pdev->dev, &bf5xx_i2s_soc_platform);
}
static int __devexit bfin_i2s_soc_platform_remove(struct platform_device *pdev)
static int bfin_i2s_soc_platform_remove(struct platform_device *pdev)
{
snd_soc_unregister_platform(&pdev->dev);
return 0;
@ -310,7 +310,7 @@ static struct platform_driver bfin_i2s_pcm_driver = {
},
.probe = bfin_i2s_soc_platform_probe,
.remove = __devexit_p(bfin_i2s_soc_platform_remove),
.remove = bfin_i2s_soc_platform_remove,
};
module_platform_driver(bfin_i2s_pcm_driver);

6
sound/soc/blackfin/bf5xx-i2s.c
View File

@ -245,7 +245,7 @@ static struct snd_soc_dai_driver bf5xx_i2s_dai = {
.ops = &bf5xx_i2s_dai_ops,
};
static int __devinit bf5xx_i2s_probe(struct platform_device *pdev)
static int bf5xx_i2s_probe(struct platform_device *pdev)
{
struct sport_device *sport_handle;
int ret;
@ -267,7 +267,7 @@ static int __devinit bf5xx_i2s_probe(struct platform_device *pdev)
return 0;
}
static int __devexit bf5xx_i2s_remove(struct platform_device *pdev)
static int bf5xx_i2s_remove(struct platform_device *pdev)
{
struct sport_device *sport_handle = platform_get_drvdata(pdev);
@ -281,7 +281,7 @@ static int __devexit bf5xx_i2s_remove(struct platform_device *pdev)
static struct platform_driver bfin_i2s_driver = {
.probe = bf5xx_i2s_probe,
.remove = __devexit_p(bf5xx_i2s_remove),
.remove = bf5xx_i2s_remove,
.driver = {
.name = "bfin-i2s",
.owner = THIS_MODULE,

6
sound/soc/blackfin/bf5xx-tdm-pcm.c
View File

@ -317,12 +317,12 @@ static struct snd_soc_platform_driver bf5xx_tdm_soc_platform = {
.pcm_free = bf5xx_pcm_free_dma_buffers,
};
static int __devinit bf5xx_soc_platform_probe(struct platform_device *pdev)
static int bf5xx_soc_platform_probe(struct platform_device *pdev)
{
return snd_soc_register_platform(&pdev->dev, &bf5xx_tdm_soc_platform);
}
static int __devexit bf5xx_soc_platform_remove(struct platform_device *pdev)
static int bf5xx_soc_platform_remove(struct platform_device *pdev)
{
snd_soc_unregister_platform(&pdev->dev);
return 0;
@ -335,7 +335,7 @@ static struct platform_driver bfin_tdm_driver = {
},
.probe = bf5xx_soc_platform_probe,
.remove = __devexit_p(bf5xx_soc_platform_remove),
.remove = bf5xx_soc_platform_remove,
};
module_platform_driver(bfin_tdm_driver);

6
sound/soc/blackfin/bf5xx-tdm.c
View File

@ -249,7 +249,7 @@ static struct snd_soc_dai_driver bf5xx_tdm_dai = {
.ops = &bf5xx_tdm_dai_ops,
};
static int __devinit bfin_tdm_probe(struct platform_device *pdev)
static int bfin_tdm_probe(struct platform_device *pdev)
{
struct sport_device *sport_handle;
int ret;
@ -295,7 +295,7 @@ sport_config_err:
return ret;
}
static int __devexit bfin_tdm_remove(struct platform_device *pdev)
static int bfin_tdm_remove(struct platform_device *pdev)
{
struct sport_device *sport_handle = platform_get_drvdata(pdev);
@ -307,7 +307,7 @@ static int __devexit bfin_tdm_remove(struct platform_device *pdev)
static struct platform_driver bfin_tdm_driver = {
.probe = bfin_tdm_probe,
.remove = __devexit_p(bfin_tdm_remove),
.remove = bfin_tdm_remove,
.driver = {
.name = "bfin-tdm",
.owner = THIS_MODULE,

6
sound/soc/blackfin/bf6xx-i2s.c
View File

@ -186,7 +186,7 @@ static struct snd_soc_dai_driver bfin_i2s_dai = {
.ops = &bfin_i2s_dai_ops,
};
static int __devinit bfin_i2s_probe(struct platform_device *pdev)
static int bfin_i2s_probe(struct platform_device *pdev)
{
struct sport_device *sport;
struct device *dev = &pdev->dev;
@ -208,7 +208,7 @@ static int __devinit bfin_i2s_probe(struct platform_device *pdev)
return 0;
}
static int __devexit bfin_i2s_remove(struct platform_device *pdev)
static int bfin_i2s_remove(struct platform_device *pdev)
{
struct sport_device *sport = platform_get_drvdata(pdev);
@ -220,7 +220,7 @@ static int __devexit bfin_i2s_remove(struct platform_device *pdev)
static struct platform_driver bfin_i2s_driver = {
.probe = bfin_i2s_probe,
.remove = __devexit_p(bfin_i2s_remove),
.remove = bfin_i2s_remove,
.driver = {
.name = "bfin-i2s",
.owner = THIS_MODULE,

4
sound/soc/blackfin/bfin-eval-adau1373.c
View File

@ -157,7 +157,7 @@ static int bfin_eval_adau1373_probe(struct platform_device *pdev)
return snd_soc_register_card(&bfin_eval_adau1373);
}
static int __devexit bfin_eval_adau1373_remove(struct platform_device *pdev)
static int bfin_eval_adau1373_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);
@ -173,7 +173,7 @@ static struct platform_driver bfin_eval_adau1373_driver = {
.pm = &snd_soc_pm_ops,
},
.probe = bfin_eval_adau1373_probe,
.remove = __devexit_p(bfin_eval_adau1373_remove),
.remove = bfin_eval_adau1373_remove,
};
module_platform_driver(bfin_eval_adau1373_driver);

4
sound/soc/blackfin/bfin-eval-adau1701.c
View File

@ -97,7 +97,7 @@ static int bfin_eval_adau1701_probe(struct platform_device *pdev)
return snd_soc_register_card(&bfin_eval_adau1701);
}
static int __devexit bfin_eval_adau1701_remove(struct platform_device *pdev)
static int bfin_eval_adau1701_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);
@ -113,7 +113,7 @@ static struct platform_driver bfin_eval_adau1701_driver = {
.pm = &snd_soc_pm_ops,
},
.probe = bfin_eval_adau1701_probe,
.remove = __devexit_p(bfin_eval_adau1701_remove),
.remove = bfin_eval_adau1701_remove,
};
module_platform_driver(bfin_eval_adau1701_driver);

4
sound/soc/blackfin/bfin-eval-adav80x.c
View File

@ -122,7 +122,7 @@ static int bfin_eval_adav80x_probe(struct platform_device *pdev)
return snd_soc_register_card(&bfin_eval_adav80x);
}
static int __devexit bfin_eval_adav80x_remove(struct platform_device *pdev)
static int bfin_eval_adav80x_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);
@ -145,7 +145,7 @@ static struct platform_driver bfin_eval_adav80x_driver = {
.pm = &snd_soc_pm_ops,
},
.probe = bfin_eval_adav80x_probe,
.remove = __devexit_p(bfin_eval_adav80x_remove),
.remove = bfin_eval_adav80x_remove,
.id_table = bfin_eval_adav80x_ids,
};

6
sound/soc/cirrus/edb93xx.c
View File

@ -80,7 +80,7 @@ static struct snd_soc_card snd_soc_edb93xx = {
.num_links = 1,
};
static int __devinit edb93xx_probe(struct platform_device *pdev)
static int edb93xx_probe(struct platform_device *pdev)
{
struct snd_soc_card *card = &snd_soc_edb93xx;
int ret;
@ -101,7 +101,7 @@ static int __devinit edb93xx_probe(struct platform_device *pdev)
return ret;
}
static int __devexit edb93xx_remove(struct platform_device *pdev)
static int edb93xx_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);
@ -117,7 +117,7 @@ static struct platform_driver edb93xx_driver = {
.owner = THIS_MODULE,
},
.probe = edb93xx_probe,
.remove = __devexit_p(edb93xx_remove),
.remove = edb93xx_remove,
};
module_platform_driver(edb93xx_driver);

6
sound/soc/cirrus/ep93xx-ac97.c
View File

@ -352,7 +352,7 @@ static struct snd_soc_dai_driver ep93xx_ac97_dai = {
.ops = &ep93xx_ac97_dai_ops,
};
static int __devinit ep93xx_ac97_probe(struct platform_device *pdev)
static int ep93xx_ac97_probe(struct platform_device *pdev)
{
struct ep93xx_ac97_info *info;
struct resource *res;
@ -402,7 +402,7 @@ fail:
return ret;
}
static int __devexit ep93xx_ac97_remove(struct platform_device *pdev)
static int ep93xx_ac97_remove(struct platform_device *pdev)
{
struct ep93xx_ac97_info *info = platform_get_drvdata(pdev);
@ -420,7 +420,7 @@ static int __devexit ep93xx_ac97_remove(struct platform_device *pdev)
static struct platform_driver ep93xx_ac97_driver = {
.probe = ep93xx_ac97_probe,
.remove = __devexit_p(ep93xx_ac97_remove),
.remove = ep93xx_ac97_remove,
.driver = {
.name = "ep93xx-ac97",
.owner = THIS_MODULE,

4
sound/soc/cirrus/ep93xx-i2s.c
View File

@ -422,7 +422,7 @@ fail:
return err;
}
static int __devexit ep93xx_i2s_remove(struct platform_device *pdev)
static int ep93xx_i2s_remove(struct platform_device *pdev)
{
struct ep93xx_i2s_info *info = dev_get_drvdata(&pdev->dev);
@ -436,7 +436,7 @@ static int __devexit ep93xx_i2s_remove(struct platform_device *pdev)
static struct platform_driver ep93xx_i2s_driver = {
.probe = ep93xx_i2s_probe,
.remove = __devexit_p(ep93xx_i2s_remove),
.remove = ep93xx_i2s_remove,
.driver = {
.name = "ep93xx-i2s",
.owner = THIS_MODULE,

6
sound/soc/cirrus/ep93xx-pcm.c
View File

@ -213,12 +213,12 @@ static struct snd_soc_platform_driver ep93xx_soc_platform = {
.pcm_free = &ep93xx_pcm_free_dma_buffers,
};
static int __devinit ep93xx_soc_platform_probe(struct platform_device *pdev)
static int ep93xx_soc_platform_probe(struct platform_device *pdev)
{
return snd_soc_register_platform(&pdev->dev, &ep93xx_soc_platform);
}
static int __devexit ep93xx_soc_platform_remove(struct platform_device *pdev)
static int ep93xx_soc_platform_remove(struct platform_device *pdev)
{
snd_soc_unregister_platform(&pdev->dev);
return 0;
@ -231,7 +231,7 @@ static struct platform_driver ep93xx_pcm_driver = {
},
.probe = ep93xx_soc_platform_probe,
.remove = __devexit_p(ep93xx_soc_platform_remove),
.remove = ep93xx_soc_platform_remove,
};
module_platform_driver(ep93xx_pcm_driver);

6
sound/soc/cirrus/simone.c
View File

@ -41,7 +41,7 @@ static struct snd_soc_card snd_soc_simone = {
static struct platform_device *simone_snd_ac97_device;
static int __devinit simone_probe(struct platform_device *pdev)
static int simone_probe(struct platform_device *pdev)
{
struct snd_soc_card *card = &snd_soc_simone;
int ret;
@ -63,7 +63,7 @@ static int __devinit simone_probe(struct platform_device *pdev)
return ret;
}
static int __devexit simone_remove(struct platform_device *pdev)
static int simone_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);
@ -79,7 +79,7 @@ static struct platform_driver simone_driver = {
.owner = THIS_MODULE,
},
.probe = simone_probe,
.remove = __devexit_p(simone_remove),
.remove = simone_remove,
};
module_platform_driver(simone_driver);

6
sound/soc/cirrus/snappercl15.c
View File

@ -98,7 +98,7 @@ static struct snd_soc_card snd_soc_snappercl15 = {
.num_links = 1,
};
static int __devinit snappercl15_probe(struct platform_device *pdev)
static int snappercl15_probe(struct platform_device *pdev)
{
struct snd_soc_card *card = &snd_soc_snappercl15;
int ret;
@ -119,7 +119,7 @@ static int __devinit snappercl15_probe(struct platform_device *pdev)
return ret;
}
static int __devexit snappercl15_remove(struct platform_device *pdev)
static int snappercl15_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);
@ -135,7 +135,7 @@ static struct platform_driver snappercl15_driver = {
.owner = THIS_MODULE,
},
.probe = snappercl15_probe,
.remove = __devexit_p(snappercl15_remove),
.remove = snappercl15_remove,
};
module_platform_driver(snappercl15_driver);

6
sound/soc/codecs/88pm860x-codec.c
View File

@ -1423,7 +1423,7 @@ static struct snd_soc_codec_driver soc_codec_dev_pm860x = {
.num_dapm_routes = ARRAY_SIZE(pm860x_dapm_routes),
};
static int __devinit pm860x_codec_probe(struct platform_device *pdev)
static int pm860x_codec_probe(struct platform_device *pdev)
{
struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);
struct pm860x_priv *pm860x;
@ -1463,7 +1463,7 @@ out:
return -EINVAL;
}
static int __devexit pm860x_codec_remove(struct platform_device *pdev)
static int pm860x_codec_remove(struct platform_device *pdev)
{
snd_soc_unregister_codec(&pdev->dev);
platform_set_drvdata(pdev, NULL);
@ -1476,7 +1476,7 @@ static struct platform_driver pm860x_codec_driver = {
.owner = THIS_MODULE,
},
.probe = pm860x_codec_probe,
.remove = __devexit_p(pm860x_codec_remove),
.remove = pm860x_codec_remove,
};
module_platform_driver(pm860x_codec_driver);

6
sound/soc/codecs/ab8500-codec.c
View File

@ -2554,7 +2554,7 @@ static struct snd_soc_codec_driver ab8500_codec_driver = {
.num_dapm_routes = ARRAY_SIZE(ab8500_dapm_routes),
};
static int __devinit ab8500_codec_driver_probe(struct platform_device *pdev)
static int ab8500_codec_driver_probe(struct platform_device *pdev)
{
int status;
struct ab8500_codec_drvdata *drvdata;
@ -2580,7 +2580,7 @@ static int __devinit ab8500_codec_driver_probe(struct platform_device *pdev)
return status;
}
static int __devexit ab8500_codec_driver_remove(struct platform_device *pdev)
static int ab8500_codec_driver_remove(struct platform_device *pdev)
{
dev_info(&pdev->dev, "%s Enter.\n", __func__);
@ -2595,7 +2595,7 @@ static struct platform_driver ab8500_codec_platform_driver = {
.owner = THIS_MODULE,
},
.probe = ab8500_codec_driver_probe,
.remove = __devexit_p(ab8500_codec_driver_remove),
.remove = ab8500_codec_driver_remove,
.suspend = NULL,
.resume = NULL,
};

6
sound/soc/codecs/ac97.c
View File

@ -118,13 +118,13 @@ static struct snd_soc_codec_driver soc_codec_dev_ac97 = {
.resume = ac97_soc_resume,
};
static __devinit int ac97_probe(struct platform_device *pdev)
static int ac97_probe(struct platform_device *pdev)
{
return snd_soc_register_codec(&pdev->dev,
&soc_codec_dev_ac97, &ac97_dai, 1);
}
static int __devexit ac97_remove(struct platform_device *pdev)
static int ac97_remove(struct platform_device *pdev)
{
snd_soc_unregister_codec(&pdev->dev);
return 0;
@ -137,7 +137,7 @@ static struct platform_driver ac97_codec_driver = {
},
.probe = ac97_probe,
.remove = __devexit_p(ac97_remove),
.remove = ac97_remove,
};
module_platform_driver(ac97_codec_driver);

6
sound/soc/codecs/ad1836.c
View File

@ -360,7 +360,7 @@ static const struct regmap_config ad1836_regmap_config = {
.cache_type = REGCACHE_RBTREE,
};
static int __devinit ad1836_spi_probe(struct spi_device *spi)
static int ad1836_spi_probe(struct spi_device *spi)
{
struct ad1836_priv *ad1836;
int ret;
@ -383,7 +383,7 @@ static int __devinit ad1836_spi_probe(struct spi_device *spi)
return ret;
}
static int __devexit ad1836_spi_remove(struct spi_device *spi)
static int ad1836_spi_remove(struct spi_device *spi)
{
snd_soc_unregister_codec(&spi->dev);
return 0;
@ -405,7 +405,7 @@ static struct spi_driver ad1836_spi_driver = {
.owner = THIS_MODULE,
},
.probe = ad1836_spi_probe,
.remove = __devexit_p(ad1836_spi_remove),
.remove = ad1836_spi_remove,
.id_table = ad1836_ids,
};

14
sound/soc/codecs/ad193x.c
View File

@ -378,7 +378,7 @@ static const struct regmap_config ad193x_spi_regmap_config = {
.volatile_reg = adau193x_reg_volatile,
};
static int __devinit ad193x_spi_probe(struct spi_device *spi)
static int ad193x_spi_probe(struct spi_device *spi)
{
struct ad193x_priv *ad193x;
@ -397,7 +397,7 @@ static int __devinit ad193x_spi_probe(struct spi_device *spi)
&ad193x_dai, 1);
}
static int __devexit ad193x_spi_remove(struct spi_device *spi)
static int ad193x_spi_remove(struct spi_device *spi)
{
snd_soc_unregister_codec(&spi->dev);
return 0;
@ -409,7 +409,7 @@ static struct spi_driver ad193x_spi_driver = {
.owner = THIS_MODULE,
},
.probe = ad193x_spi_probe,
.remove = __devexit_p(ad193x_spi_remove),
.remove = ad193x_spi_remove,
};
#endif
@ -430,8 +430,8 @@ static const struct i2c_device_id ad193x_id[] = {
};
MODULE_DEVICE_TABLE(i2c, ad193x_id);
static int __devinit ad193x_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int ad193x_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct ad193x_priv *ad193x;
@ -450,7 +450,7 @@ static int __devinit ad193x_i2c_probe(struct i2c_client *client,
&ad193x_dai, 1);
}
static int __devexit ad193x_i2c_remove(struct i2c_client *client)
static int ad193x_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
return 0;
@ -461,7 +461,7 @@ static struct i2c_driver ad193x_i2c_driver = {
.name = "ad193x",
},
.probe = ad193x_i2c_probe,
.remove = __devexit_p(ad193x_i2c_remove),
.remove = ad193x_i2c_remove,
.id_table = ad193x_id,
};
#endif

6
sound/soc/codecs/ad1980.c
View File

@ -255,13 +255,13 @@ static struct snd_soc_codec_driver soc_codec_dev_ad1980 = {
.read = ac97_read,
};
static __devinit int ad1980_probe(struct platform_device *pdev)
static int ad1980_probe(struct platform_device *pdev)
{
return snd_soc_register_codec(&pdev->dev,
&soc_codec_dev_ad1980, &ad1980_dai, 1);
}
static int __devexit ad1980_remove(struct platform_device *pdev)
static int ad1980_remove(struct platform_device *pdev)
{
snd_soc_unregister_codec(&pdev->dev);
return 0;
@ -274,7 +274,7 @@ static struct platform_driver ad1980_codec_driver = {
},
.probe = ad1980_probe,
.remove = __devexit_p(ad1980_remove),
.remove = ad1980_remove,
};
module_platform_driver(ad1980_codec_driver);

4
sound/soc/codecs/ad73311.c
View File

@ -47,7 +47,7 @@ static int ad73311_probe(struct platform_device *pdev)
&soc_codec_dev_ad73311, &ad73311_dai, 1);
}
static int __devexit ad73311_remove(struct platform_device *pdev)
static int ad73311_remove(struct platform_device *pdev)
{
snd_soc_unregister_codec(&pdev->dev);
return 0;
@ -60,7 +60,7 @@ static struct platform_driver ad73311_codec_driver = {
},
.probe = ad73311_probe,
.remove = __devexit_p(ad73311_remove),
.remove = ad73311_remove,
};
module_platform_driver(ad73311_codec_driver);

8
sound/soc/codecs/adau1373.c
View File

@ -1353,8 +1353,8 @@ static struct snd_soc_codec_driver adau1373_codec_driver = {
.num_dapm_routes = ARRAY_SIZE(adau1373_dapm_routes),
};
static int __devinit adau1373_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int adau1373_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct adau1373 *adau1373;
int ret;
@ -1370,7 +1370,7 @@ static int __devinit adau1373_i2c_probe(struct i2c_client *client,
return ret;
}
static int __devexit adau1373_i2c_remove(struct i2c_client *client)
static int adau1373_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
return 0;
@ -1388,7 +1388,7 @@ static struct i2c_driver adau1373_i2c_driver = {
.owner = THIS_MODULE,
},
.probe = adau1373_i2c_probe,
.remove = __devexit_p(adau1373_i2c_remove),
.remove = adau1373_i2c_remove,
.id_table = adau1373_i2c_id,
};

8
sound/soc/codecs/adau1701.c
View File

@ -489,8 +489,8 @@ static struct snd_soc_codec_driver adau1701_codec_drv = {
.set_sysclk = adau1701_set_sysclk,
};
static __devinit int adau1701_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int adau1701_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct adau1701 *adau1701;
int ret;
@ -505,7 +505,7 @@ static __devinit int adau1701_i2c_probe(struct i2c_client *client,
return ret;
}
static __devexit int adau1701_i2c_remove(struct i2c_client *client)
static int adau1701_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
return 0;
@ -523,7 +523,7 @@ static struct i2c_driver adau1701_i2c_driver = {
.owner = THIS_MODULE,
},
.probe = adau1701_i2c_probe,
.remove = __devexit_p(adau1701_i2c_remove),
.remove = adau1701_i2c_remove,
.id_table = adau1701_i2c_id,
};

20
sound/soc/codecs/adav80x.c
View File

@ -839,8 +839,8 @@ static struct snd_soc_codec_driver adav80x_codec_driver = {
.num_dapm_routes = ARRAY_SIZE(adav80x_dapm_routes),
};
static int __devinit adav80x_bus_probe(struct device *dev,
enum snd_soc_control_type control_type)
static int adav80x_bus_probe(struct device *dev,
enum snd_soc_control_type control_type)
{
struct adav80x *adav80x;
int ret;
@ -860,7 +860,7 @@ static int __devinit adav80x_bus_probe(struct device *dev,
return ret;
}
static int __devexit adav80x_bus_remove(struct device *dev)
static int adav80x_bus_remove(struct device *dev)
{
snd_soc_unregister_codec(dev);
kfree(dev_get_drvdata(dev));
@ -868,12 +868,12 @@ static int __devexit adav80x_bus_remove(struct device *dev)
}
#if defined(CONFIG_SPI_MASTER)
static int __devinit adav80x_spi_probe(struct spi_device *spi)
static int adav80x_spi_probe(struct spi_device *spi)
{
return adav80x_bus_probe(&spi->dev, SND_SOC_SPI);
}
static int __devexit adav80x_spi_remove(struct spi_device *spi)
static int adav80x_spi_remove(struct spi_device *spi)
{
return adav80x_bus_remove(&spi->dev);
}
@ -884,7 +884,7 @@ static struct spi_driver adav80x_spi_driver = {
.owner = THIS_MODULE,
},
.probe = adav80x_spi_probe,
.remove = __devexit_p(adav80x_spi_remove),
.remove = adav80x_spi_remove,
};
#endif
@ -895,13 +895,13 @@ static const struct i2c_device_id adav80x_id[] = {
};
MODULE_DEVICE_TABLE(i2c, adav80x_id);
static int __devinit adav80x_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int adav80x_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
return adav80x_bus_probe(&client->dev, SND_SOC_I2C);
}
static int __devexit adav80x_i2c_remove(struct i2c_client *client)
static int adav80x_i2c_remove(struct i2c_client *client)
{
return adav80x_bus_remove(&client->dev);
}
@ -912,7 +912,7 @@ static struct i2c_driver adav80x_i2c_driver = {
.owner = THIS_MODULE,
},
.probe = adav80x_i2c_probe,
.remove = __devexit_p(adav80x_i2c_remove),
.remove = adav80x_i2c_remove,
.id_table = adav80x_id,
};
#endif

6
sound/soc/codecs/ads117x.c
View File

@ -36,13 +36,13 @@ static struct snd_soc_dai_driver ads117x_dai = {
static struct snd_soc_codec_driver soc_codec_dev_ads117x;
static __devinit int ads117x_probe(struct platform_device *pdev)
static int ads117x_probe(struct platform_device *pdev)
{
return snd_soc_register_codec(&pdev->dev,
&soc_codec_dev_ads117x, &ads117x_dai, 1);
}
static int __devexit ads117x_remove(struct platform_device *pdev)
static int ads117x_remove(struct platform_device *pdev)
{
snd_soc_unregister_codec(&pdev->dev);
return 0;
@ -55,7 +55,7 @@ static struct platform_driver ads117x_codec_driver = {
},
.probe = ads117x_probe,
.remove = __devexit_p(ads117x_remove),
.remove = ads117x_remove,
};
module_platform_driver(ads117x_codec_driver);

4
sound/soc/codecs/ak4104.c
View File

@ -258,7 +258,7 @@ static int ak4104_spi_probe(struct spi_device *spi)
return ret;
}
static int __devexit ak4104_spi_remove(struct spi_device *spi)
static int ak4104_spi_remove(struct spi_device *spi)
{
snd_soc_unregister_codec(&spi->dev);
return 0;
@ -277,7 +277,7 @@ static struct spi_driver ak4104_spi_driver = {
.of_match_table = ak4104_of_match,
},
.probe = ak4104_spi_probe,
.remove = __devexit_p(ak4104_spi_remove),
.remove = ak4104_spi_remove,
};
module_spi_driver(ak4104_spi_driver);

8
sound/soc/codecs/ak4535.c
View File

@ -436,8 +436,8 @@ static struct snd_soc_codec_driver soc_codec_dev_ak4535 = {
.num_dapm_routes = ARRAY_SIZE(ak4535_audio_map),
};
static __devinit int ak4535_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int ak4535_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
struct ak4535_priv *ak4535;
int ret;
@ -462,7 +462,7 @@ static __devinit int ak4535_i2c_probe(struct i2c_client *i2c,
return ret;
}
static __devexit int ak4535_i2c_remove(struct i2c_client *client)
static int ak4535_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
return 0;
@ -480,7 +480,7 @@ static struct i2c_driver ak4535_i2c_driver = {
.owner = THIS_MODULE,
},
.probe = ak4535_i2c_probe,
.remove = __devexit_p(ak4535_i2c_remove),
.remove = ak4535_i2c_remove,
.id_table = ak4535_i2c_id,
};

8
sound/soc/codecs/ak4641.c
View File

@ -557,8 +557,8 @@ static struct snd_soc_codec_driver soc_codec_dev_ak4641 = {
};
static int __devinit ak4641_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int ak4641_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
struct ak4641_platform_data *pdata = i2c->dev.platform_data;
struct ak4641_priv *ak4641;
@ -610,7 +610,7 @@ err_out:
return ret;
}
static int __devexit ak4641_i2c_remove(struct i2c_client *i2c)
static int ak4641_i2c_remove(struct i2c_client *i2c)
{
struct ak4641_platform_data *pdata = i2c->dev.platform_data;
@ -640,7 +640,7 @@ static struct i2c_driver ak4641_i2c_driver = {
.owner = THIS_MODULE,
},
.probe = ak4641_i2c_probe,
.remove = __devexit_p(ak4641_i2c_remove),
.remove = ak4641_i2c_remove,
.id_table = ak4641_i2c_id,
};

8
sound/soc/codecs/ak4642.c
View File

@ -513,15 +513,15 @@ static struct snd_soc_codec_driver soc_codec_dev_ak4648 = {
};
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
static __devinit int ak4642_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int ak4642_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
return snd_soc_register_codec(&i2c->dev,
(struct snd_soc_codec_driver *)id->driver_data,
&ak4642_dai, 1);
}
static __devexit int ak4642_i2c_remove(struct i2c_client *client)
static int ak4642_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
return 0;
@ -541,7 +541,7 @@ static struct i2c_driver ak4642_i2c_driver = {
.owner = THIS_MODULE,
},
.probe = ak4642_i2c_probe,
.remove = __devexit_p(ak4642_i2c_remove),
.remove = ak4642_i2c_remove,
.id_table = ak4642_i2c_id,
};
#endif

8
sound/soc/codecs/ak4671.c
View File

@ -655,8 +655,8 @@ static struct snd_soc_codec_driver soc_codec_dev_ak4671 = {
.num_dapm_routes = ARRAY_SIZE(ak4671_intercon),
};
static int __devinit ak4671_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int ak4671_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct ak4671_priv *ak4671;
int ret;
@ -674,7 +674,7 @@ static int __devinit ak4671_i2c_probe(struct i2c_client *client,
return ret;
}
static __devexit int ak4671_i2c_remove(struct i2c_client *client)
static int ak4671_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
return 0;
@ -692,7 +692,7 @@ static struct i2c_driver ak4671_i2c_driver = {
.owner = THIS_MODULE,
},
.probe = ak4671_i2c_probe,
.remove = __devexit_p(ak4671_i2c_remove),
.remove = ak4671_i2c_remove,
.id_table = ak4671_i2c_id,
};

8
sound/soc/codecs/alc5623.c
View File

@ -991,8 +991,8 @@ static struct snd_soc_codec_driver soc_codec_device_alc5623 = {
* low = 0x1a
* high = 0x1b
*/
static __devinit int alc5623_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int alc5623_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct alc5623_platform_data *pdata;
struct alc5623_priv *alc5623;
@ -1058,7 +1058,7 @@ static __devinit int alc5623_i2c_probe(struct i2c_client *client,
return ret;
}
static __devexit int alc5623_i2c_remove(struct i2c_client *client)
static int alc5623_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
return 0;
@ -1079,7 +1079,7 @@ static struct i2c_driver alc5623_i2c_driver = {
.owner = THIS_MODULE,
},
.probe = alc5623_i2c_probe,
.remove = __devexit_p(alc5623_i2c_remove),
.remove = alc5623_i2c_remove,
.id_table = alc5623_i2c_table,
};

8
sound/soc/codecs/alc5632.c
View File

@ -1116,8 +1116,8 @@ static struct regmap_config alc5632_regmap = {
* low = 0x1a
* high = 0x1b
*/
static __devinit int alc5632_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int alc5632_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct alc5632_priv *alc5632;
int ret, ret1, ret2;
@ -1179,7 +1179,7 @@ static __devinit int alc5632_i2c_probe(struct i2c_client *client,
return ret;
}
static __devexit int alc5632_i2c_remove(struct i2c_client *client)
static int alc5632_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
return 0;
@ -1198,7 +1198,7 @@ static struct i2c_driver alc5632_i2c_driver = {
.owner = THIS_MODULE,
},
.probe = alc5632_i2c_probe,
.remove = __devexit_p(alc5632_i2c_remove),
.remove = alc5632_i2c_remove,
.id_table = alc5632_i2c_table,
};

32
sound/soc/codecs/arizona.c
View File

@ -226,6 +226,31 @@ EXPORT_SYMBOL_GPL(arizona_mixer_values);
const DECLARE_TLV_DB_SCALE(arizona_mixer_tlv, -3200, 100, 0);
EXPORT_SYMBOL_GPL(arizona_mixer_tlv);
static const char *arizona_vol_ramp_text[] = {
"0ms/6dB", "0.5ms/6dB", "1ms/6dB", "2ms/6dB", "4ms/6dB", "8ms/6dB",
"15ms/6dB", "30ms/6dB",
};
const struct soc_enum arizona_in_vd_ramp =
SOC_ENUM_SINGLE(ARIZONA_INPUT_VOLUME_RAMP,
ARIZONA_IN_VD_RAMP_SHIFT, 7, arizona_vol_ramp_text);
EXPORT_SYMBOL_GPL(arizona_in_vd_ramp);
const struct soc_enum arizona_in_vi_ramp =
SOC_ENUM_SINGLE(ARIZONA_INPUT_VOLUME_RAMP,
ARIZONA_IN_VI_RAMP_SHIFT, 7, arizona_vol_ramp_text);
EXPORT_SYMBOL_GPL(arizona_in_vi_ramp);
const struct soc_enum arizona_out_vd_ramp =
SOC_ENUM_SINGLE(ARIZONA_OUTPUT_VOLUME_RAMP,
ARIZONA_OUT_VD_RAMP_SHIFT, 7, arizona_vol_ramp_text);
EXPORT_SYMBOL_GPL(arizona_out_vd_ramp);
const struct soc_enum arizona_out_vi_ramp =
SOC_ENUM_SINGLE(ARIZONA_OUTPUT_VOLUME_RAMP,
ARIZONA_OUT_VI_RAMP_SHIFT, 7, arizona_vol_ramp_text);
EXPORT_SYMBOL_GPL(arizona_out_vi_ramp);
static const char *arizona_lhpf_mode_text[] = {
"Low-pass", "High-pass"
};
@ -749,6 +774,9 @@ static int arizona_dai_set_sysclk(struct snd_soc_dai *dai,
return -EBUSY;
}
dev_dbg(codec->dev, "Setting AIF%d to %s\n", dai->id + 1,
arizona_dai_clk_str(clk_id));
memset(&routes, 0, sizeof(routes));
routes[0].sink = dai->driver->capture.stream_name;
routes[1].sink = dai->driver->playback.stream_name;
@ -761,6 +789,8 @@ static int arizona_dai_set_sysclk(struct snd_soc_dai *dai,
routes[1].source = arizona_dai_clk_str(clk_id);
snd_soc_dapm_add_routes(&codec->dapm, routes, ARRAY_SIZE(routes));
dai_priv->clk = clk_id;
return snd_soc_dapm_sync(&codec->dapm);
}
@ -1016,7 +1046,7 @@ int arizona_set_fll(struct arizona_fll *fll, int source,
ARIZONA_FLL1_SYNC_ENA);
ret = wait_for_completion_timeout(&fll->ok,
msecs_to_jiffies(25));
msecs_to_jiffies(250));
if (ret == 0)
arizona_fll_warn(fll, "Timed out waiting for lock\n");

6
sound/soc/codecs/arizona.h
View File

@ -165,6 +165,12 @@ extern int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS];
ARIZONA_MIXER_ROUTES(name, name "L"), \
ARIZONA_MIXER_ROUTES(name, name "R")
extern const struct soc_enum arizona_in_vi_ramp;
extern const struct soc_enum arizona_in_vd_ramp;
extern const struct soc_enum arizona_out_vi_ramp;
extern const struct soc_enum arizona_out_vd_ramp;
extern const struct soc_enum arizona_lhpf1_mode;
extern const struct soc_enum arizona_lhpf2_mode;
extern const struct soc_enum arizona_lhpf3_mode;

2
sound/soc/codecs/cq93vc.c
View File

@ -201,7 +201,7 @@ static struct platform_driver cq93vc_codec_driver = {
},
.probe = cq93vc_platform_probe,
.remove = __devexit_p(cq93vc_platform_remove),
.remove = cq93vc_platform_remove,
};
module_platform_driver(cq93vc_codec_driver);

14
sound/soc/codecs/cs4271.c
View File

@ -570,7 +570,7 @@ static struct snd_soc_codec_driver soc_codec_dev_cs4271 = {
};
#if defined(CONFIG_SPI_MASTER)
static int __devinit cs4271_spi_probe(struct spi_device *spi)
static int cs4271_spi_probe(struct spi_device *spi)
{
struct cs4271_private *cs4271;
@ -585,7 +585,7 @@ static int __devinit cs4271_spi_probe(struct spi_device *spi)
&cs4271_dai, 1);
}
static int __devexit cs4271_spi_remove(struct spi_device *spi)
static int cs4271_spi_remove(struct spi_device *spi)
{
snd_soc_unregister_codec(&spi->dev);
return 0;
@ -598,7 +598,7 @@ static struct spi_driver cs4271_spi_driver = {
.of_match_table = of_match_ptr(cs4271_dt_ids),
},
.probe = cs4271_spi_probe,
.remove = __devexit_p(cs4271_spi_remove),
.remove = cs4271_spi_remove,
};
#endif /* defined(CONFIG_SPI_MASTER) */
@ -609,8 +609,8 @@ static const struct i2c_device_id cs4271_i2c_id[] = {
};
MODULE_DEVICE_TABLE(i2c, cs4271_i2c_id);
static int __devinit cs4271_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int cs4271_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct cs4271_private *cs4271;
@ -625,7 +625,7 @@ static int __devinit cs4271_i2c_probe(struct i2c_client *client,
&cs4271_dai, 1);
}
static int __devexit cs4271_i2c_remove(struct i2c_client *client)
static int cs4271_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
return 0;
@ -639,7 +639,7 @@ static struct i2c_driver cs4271_i2c_driver = {
},
.id_table = cs4271_i2c_id,
.probe = cs4271_i2c_probe,
.remove = __devexit_p(cs4271_i2c_remove),
.remove = cs4271_i2c_remove,
};
#endif /* defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) */

2
sound/soc/codecs/cs42l52.c
View File

@ -1271,7 +1271,7 @@ static struct i2c_driver cs42l52_i2c_driver = {
},
.id_table = cs42l52_id,
.probe = cs42l52_i2c_probe,
.remove = __devexit_p(cs42l52_i2c_remove),
.remove = cs42l52_i2c_remove,
};
module_i2c_driver(cs42l52_i2c_driver);

8
sound/soc/codecs/cs42l73.c
View File

@ -1345,8 +1345,8 @@ static struct regmap_config cs42l73_regmap = {
.cache_type = REGCACHE_RBTREE,
};
static __devinit int cs42l73_i2c_probe(struct i2c_client *i2c_client,
const struct i2c_device_id *id)
static int cs42l73_i2c_probe(struct i2c_client *i2c_client,
const struct i2c_device_id *id)
{
struct cs42l73_private *cs42l73;
int ret;
@ -1406,7 +1406,7 @@ static __devinit int cs42l73_i2c_probe(struct i2c_client *i2c_client,
return 0;
}
static __devexit int cs42l73_i2c_remove(struct i2c_client *client)
static int cs42l73_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
return 0;
@ -1426,7 +1426,7 @@ static struct i2c_driver cs42l73_i2c_driver = {
},
.id_table = cs42l73_id,
.probe = cs42l73_i2c_probe,
.remove = __devexit_p(cs42l73_i2c_remove),
.remove = cs42l73_i2c_remove,
};

25
sound/soc/codecs/da7210.c
View File

@ -1218,8 +1218,8 @@ static const struct regmap_config da7210_regmap_config_i2c = {
.cache_type = REGCACHE_RBTREE,
};
static int __devinit da7210_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int da7210_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
struct da7210_priv *da7210;
int ret;
@ -1251,7 +1251,7 @@ static int __devinit da7210_i2c_probe(struct i2c_client *i2c,
return ret;
}
static int __devexit da7210_i2c_remove(struct i2c_client *client)
static int da7210_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
return 0;
@ -1270,7 +1270,7 @@ static struct i2c_driver da7210_i2c_driver = {
.owner = THIS_MODULE,
},
.probe = da7210_i2c_probe,
.remove = __devexit_p(da7210_i2c_remove),
.remove = da7210_i2c_remove,
.id_table = da7210_i2c_id,
};
#endif
@ -1314,7 +1314,7 @@ static const struct regmap_config da7210_regmap_config_spi = {
.cache_type = REGCACHE_RBTREE,
};
static int __devinit da7210_spi_probe(struct spi_device *spi)
static int da7210_spi_probe(struct spi_device *spi)
{
struct da7210_priv *da7210;
int ret;
@ -1337,24 +1337,15 @@ static int __devinit da7210_spi_probe(struct spi_device *spi)
if (ret != 0)
dev_warn(&spi->dev, "Failed to apply regmap patch: %d\n", ret);
ret = snd_soc_register_codec(&spi->dev,
ret = snd_soc_register_codec(&spi->dev,
&soc_codec_dev_da7210, &da7210_dai, 1);
if (ret < 0)
goto err_regmap;
return ret;
err_regmap:
regmap_exit(da7210->regmap);
return ret;
}
static int __devexit da7210_spi_remove(struct spi_device *spi)
static int da7210_spi_remove(struct spi_device *spi)
{
struct da7210_priv *da7210 = spi_get_drvdata(spi);
snd_soc_unregister_codec(&spi->dev);
regmap_exit(da7210->regmap);
return 0;
}
@ -1364,7 +1355,7 @@ static struct spi_driver da7210_spi_driver = {
.owner = THIS_MODULE,
},
.probe = da7210_spi_probe,
.remove = __devexit_p(da7210_spi_remove)
.remove = da7210_spi_remove
};
#endif

8
sound/soc/codecs/da732x.c
View File

@ -1557,8 +1557,8 @@ static struct snd_soc_codec_driver soc_codec_dev_da732x = {
.reg_cache_size = ARRAY_SIZE(da732x_reg_cache),
};
static __devinit int da732x_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int da732x_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
struct da732x_priv *da732x;
unsigned int reg;
@ -1596,7 +1596,7 @@ err:
return ret;
}
static __devexit int da732x_i2c_remove(struct i2c_client *client)
static int da732x_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
@ -1615,7 +1615,7 @@ static struct i2c_driver da732x_i2c_driver = {
.owner = THIS_MODULE,
},
.probe = da732x_i2c_probe,
.remove = __devexit_p(da732x_i2c_remove),
.remove = da732x_i2c_remove,
.id_table = da732x_i2c_id,
};

8
sound/soc/codecs/da9055.c
View File

@ -1484,8 +1484,8 @@ static const struct regmap_config da9055_regmap_config = {
.cache_type = REGCACHE_RBTREE,
};
static int __devinit da9055_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int da9055_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
struct da9055_priv *da9055;
struct da9055_platform_data *pdata = dev_get_platdata(&i2c->dev);
@ -1517,7 +1517,7 @@ static int __devinit da9055_i2c_probe(struct i2c_client *i2c,
return ret;
}
static int __devexit da9055_remove(struct i2c_client *client)
static int da9055_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
return 0;
@ -1536,7 +1536,7 @@ static struct i2c_driver da9055_i2c_driver = {
.owner = THIS_MODULE,
},
.probe = da9055_i2c_probe,
.remove = __devexit_p(da9055_remove),
.remove = da9055_remove,
.id_table = da9055_i2c_id,
};

6
sound/soc/codecs/dfbmcs320.c
View File

@ -33,13 +33,13 @@ static struct snd_soc_dai_driver dfbmcs320_dai = {
static struct snd_soc_codec_driver soc_codec_dev_dfbmcs320;
static int __devinit dfbmcs320_probe(struct platform_device *pdev)
static int dfbmcs320_probe(struct platform_device *pdev)
{
return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_dfbmcs320,
&dfbmcs320_dai, 1);
}
static int __devexit dfbmcs320_remove(struct platform_device *pdev)
static int dfbmcs320_remove(struct platform_device *pdev)
{
snd_soc_unregister_codec(&pdev->dev);
@ -52,7 +52,7 @@ static struct platform_driver dfmcs320_driver = {
.owner = THIS_MODULE,
},
.probe = dfbmcs320_probe,
.remove = __devexit_p(dfbmcs320_remove),
.remove = dfbmcs320_remove,
};
module_platform_driver(dfmcs320_driver);

6
sound/soc/codecs/dmic.c
View File

@ -66,13 +66,13 @@ static struct snd_soc_codec_driver soc_dmic = {
.probe = dmic_probe,
};
static int __devinit dmic_dev_probe(struct platform_device *pdev)
static int dmic_dev_probe(struct platform_device *pdev)
{
return snd_soc_register_codec(&pdev->dev,
&soc_dmic, &dmic_dai, 1);
}
static int __devexit dmic_dev_remove(struct platform_device *pdev)
static int dmic_dev_remove(struct platform_device *pdev)
{
snd_soc_unregister_codec(&pdev->dev);
return 0;
@ -86,7 +86,7 @@ static struct platform_driver dmic_driver = {
.owner = THIS_MODULE,
},
.probe = dmic_dev_probe,
.remove = __devexit_p(dmic_dev_remove),
.remove = dmic_dev_remove,
};
module_platform_driver(dmic_driver);

8
sound/soc/codecs/isabelle.c
View File

@ -1119,8 +1119,8 @@ static const struct regmap_config isabelle_regmap_config = {
.cache_type = REGCACHE_RBTREE,
};
static int __devinit isabelle_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int isabelle_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
struct regmap *isabelle_regmap;
int ret = 0;
@ -1145,7 +1145,7 @@ static int __devinit isabelle_i2c_probe(struct i2c_client *i2c,
return ret;
}
static int __devexit isabelle_i2c_remove(struct i2c_client *client)
static int isabelle_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
return 0;
@ -1163,7 +1163,7 @@ static struct i2c_driver isabelle_i2c_driver = {
.owner = THIS_MODULE,
},
.probe = isabelle_i2c_probe,
.remove = __devexit_p(isabelle_i2c_remove),
.remove = isabelle_i2c_remove,
.id_table = isabelle_i2c_id,
};

6
sound/soc/codecs/jz4740.c
View File

@ -348,7 +348,7 @@ static const struct regmap_config jz4740_codec_regmap_config = {
.cache_type = REGCACHE_RBTREE,
};
static int __devinit jz4740_codec_probe(struct platform_device *pdev)
static int jz4740_codec_probe(struct platform_device *pdev)
{
int ret;
struct jz4740_codec *jz4740_codec;
@ -380,7 +380,7 @@ static int __devinit jz4740_codec_probe(struct platform_device *pdev)
return ret;
}
static int __devexit jz4740_codec_remove(struct platform_device *pdev)
static int jz4740_codec_remove(struct platform_device *pdev)
{
snd_soc_unregister_codec(&pdev->dev);
@ -391,7 +391,7 @@ static int __devexit jz4740_codec_remove(struct platform_device *pdev)
static struct platform_driver jz4740_codec_driver = {
.probe = jz4740_codec_probe,
.remove = __devexit_p(jz4740_codec_remove),
.remove = jz4740_codec_remove,
.driver = {
.name = "jz4740-codec",
.owner = THIS_MODULE,

8
sound/soc/codecs/lm4857.c
View File

@ -209,8 +209,8 @@ static struct snd_soc_codec_driver soc_codec_dev_lm4857 = {
.set_bias_level = lm4857_set_bias_level,
};
static int __devinit lm4857_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int lm4857_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
struct lm4857 *lm4857;
int ret;
@ -228,7 +228,7 @@ static int __devinit lm4857_i2c_probe(struct i2c_client *i2c,
return ret;
}
static int __devexit lm4857_i2c_remove(struct i2c_client *i2c)
static int lm4857_i2c_remove(struct i2c_client *i2c)
{
snd_soc_unregister_codec(&i2c->dev);
return 0;
@ -246,7 +246,7 @@ static struct i2c_driver lm4857_i2c_driver = {
.owner = THIS_MODULE,
},
.probe = lm4857_i2c_probe,
.remove = __devexit_p(lm4857_i2c_remove),
.remove = lm4857_i2c_remove,
.id_table = lm4857_i2c_id,
};

8
sound/soc/codecs/lm49453.c
View File

@ -1483,8 +1483,8 @@ static const struct regmap_config lm49453_regmap_config = {
.cache_type = REGCACHE_RBTREE,
};
static __devinit int lm49453_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int lm49453_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
struct lm49453_priv *lm49453;
int ret = 0;
@ -1514,7 +1514,7 @@ static __devinit int lm49453_i2c_probe(struct i2c_client *i2c,
return ret;
}
static int __devexit lm49453_i2c_remove(struct i2c_client *client)
static int lm49453_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
return 0;
@ -1532,7 +1532,7 @@ static struct i2c_driver lm49453_i2c_driver = {
.owner = THIS_MODULE,
},
.probe = lm49453_i2c_probe,
.remove = __devexit_p(lm49453_i2c_remove),
.remove = lm49453_i2c_remove,
.id_table = lm49453_i2c_id,
};

8
sound/soc/codecs/max9768.c
View File

@ -159,8 +159,8 @@ static const struct regmap_config max9768_i2c_regmap_config = {
.cache_type = REGCACHE_RBTREE,
};
static int __devinit max9768_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int max9768_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct max9768 *max9768;
struct max9768_pdata *pdata = client->dev.platform_data;
@ -208,7 +208,7 @@ static int __devinit max9768_i2c_probe(struct i2c_client *client,
return err;
}
static int __devexit max9768_i2c_remove(struct i2c_client *client)
static int max9768_i2c_remove(struct i2c_client *client)
{
struct max9768 *max9768 = i2c_get_clientdata(client);
@ -234,7 +234,7 @@ static struct i2c_driver max9768_i2c_driver = {
.owner = THIS_MODULE,
},
.probe = max9768_i2c_probe,
.remove = __devexit_p(max9768_i2c_remove),
.remove = max9768_i2c_remove,
.id_table = max9768_i2c_id,
};
module_i2c_driver(max9768_i2c_driver);

2
sound/soc/codecs/max98088.c
View File

@ -2084,7 +2084,7 @@ static int max98088_i2c_probe(struct i2c_client *i2c,
return ret;
}
static int __devexit max98088_i2c_remove(struct i2c_client *client)
static int max98088_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
return 0;

4
sound/soc/codecs/max98095.c
View File

@ -2511,7 +2511,7 @@ static int max98095_i2c_probe(struct i2c_client *i2c,
return ret;
}
static int __devexit max98095_i2c_remove(struct i2c_client *client)
static int max98095_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
return 0;
@ -2529,7 +2529,7 @@ static struct i2c_driver max98095_i2c_driver = {
.owner = THIS_MODULE,
},
.probe = max98095_i2c_probe,
.remove = __devexit_p(max98095_i2c_remove),
.remove = max98095_i2c_remove,
.id_table = max98095_i2c_id,
};

8
sound/soc/codecs/max9850.c
View File

@ -329,8 +329,8 @@ static struct snd_soc_codec_driver soc_codec_dev_max9850 = {
.num_dapm_routes = ARRAY_SIZE(max9850_dapm_routes),
};
static int __devinit max9850_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int max9850_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
struct max9850_priv *max9850;
int ret;
@ -347,7 +347,7 @@ static int __devinit max9850_i2c_probe(struct i2c_client *i2c,
return ret;
}
static __devexit int max9850_i2c_remove(struct i2c_client *client)
static int max9850_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
return 0;
@ -365,7 +365,7 @@ static struct i2c_driver max9850_i2c_driver = {
.owner = THIS_MODULE,
},
.probe = max9850_i2c_probe,
.remove = __devexit_p(max9850_i2c_remove),
.remove = max9850_i2c_remove,
.id_table = max9850_i2c_id,
};

8
sound/soc/codecs/max9877.c
View File

@ -258,8 +258,8 @@ int max9877_add_controls(struct snd_soc_codec *codec)
}
EXPORT_SYMBOL_GPL(max9877_add_controls);
static int __devinit max9877_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int max9877_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
i2c = client;
@ -268,7 +268,7 @@ static int __devinit max9877_i2c_probe(struct i2c_client *client,
return 0;
}
static __devexit int max9877_i2c_remove(struct i2c_client *client)
static int max9877_i2c_remove(struct i2c_client *client)
{
i2c = NULL;
@ -287,7 +287,7 @@ static struct i2c_driver max9877_i2c_driver = {
.owner = THIS_MODULE,
},
.probe = max9877_i2c_probe,
.remove = __devexit_p(max9877_i2c_remove),
.remove = max9877_i2c_remove,
.id_table = max9877_i2c_id,
};

2
sound/soc/codecs/mc13783.c
View File

@ -779,7 +779,7 @@ static struct platform_driver mc13783_codec_driver = {
.owner = THIS_MODULE,
},
.probe = mc13783_codec_probe,
.remove = __devexit_p(mc13783_codec_remove),
.remove = mc13783_codec_remove,
};
module_platform_driver(mc13783_codec_driver);

8
sound/soc/codecs/ml26124.c
View File

@ -626,8 +626,8 @@ static const struct regmap_config ml26124_i2c_regmap = {
.write_flag_mask = 0x01,
};
static __devinit int ml26124_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int ml26124_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
struct ml26124_priv *priv;
int ret;
@ -649,7 +649,7 @@ static __devinit int ml26124_i2c_probe(struct i2c_client *i2c,
&soc_codec_dev_ml26124, &ml26124_dai, 1);
}
static __devexit int ml26124_i2c_remove(struct i2c_client *client)
static int ml26124_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
return 0;
@ -667,7 +667,7 @@ static struct i2c_driver ml26124_i2c_driver = {
.owner = THIS_MODULE,
},
.probe = ml26124_i2c_probe,
.remove = __devexit_p(ml26124_i2c_remove),
.remove = ml26124_i2c_remove,
.id_table = ml26124_i2c_id,
};

6
sound/soc/codecs/omap-hdmi.c
View File

@ -39,13 +39,13 @@ static struct snd_soc_dai_driver omap_hdmi_codec_dai = {
},
};
static __devinit int omap_hdmi_codec_probe(struct platform_device *pdev)
static int omap_hdmi_codec_probe(struct platform_device *pdev)
{
return snd_soc_register_codec(&pdev->dev, &omap_hdmi_codec,
&omap_hdmi_codec_dai, 1);
}
static __devexit int omap_hdmi_codec_remove(struct platform_device *pdev)
static int omap_hdmi_codec_remove(struct platform_device *pdev)
{
snd_soc_unregister_codec(&pdev->dev);
return 0;
@ -58,7 +58,7 @@ static struct platform_driver omap_hdmi_codec_driver = {
},
.probe = omap_hdmi_codec_probe,
.remove = __devexit_p(omap_hdmi_codec_remove),
.remove = omap_hdmi_codec_remove,
};
module_platform_driver(omap_hdmi_codec_driver);

6
sound/soc/codecs/pcm3008.c
View File

@ -149,13 +149,13 @@ static struct snd_soc_codec_driver soc_codec_dev_pcm3008 = {
.resume = pcm3008_soc_resume,
};
static int __devinit pcm3008_codec_probe(struct platform_device *pdev)
static int pcm3008_codec_probe(struct platform_device *pdev)
{
return snd_soc_register_codec(&pdev->dev,
&soc_codec_dev_pcm3008, &pcm3008_dai, 1);
}
static int __devexit pcm3008_codec_remove(struct platform_device *pdev)
static int pcm3008_codec_remove(struct platform_device *pdev)
{
snd_soc_unregister_codec(&pdev->dev);
return 0;
@ -165,7 +165,7 @@ MODULE_ALIAS("platform:pcm3008-codec");
static struct platform_driver pcm3008_codec_driver = {
.probe = pcm3008_codec_probe,
.remove = __devexit_p(pcm3008_codec_remove),
.remove = pcm3008_codec_remove,
.driver = {
.name = "pcm3008-codec",
.owner = THIS_MODULE,

4
sound/soc/codecs/rt5631.c
View File

@ -1748,7 +1748,7 @@ static int rt5631_i2c_probe(struct i2c_client *i2c,
return ret;
}
static __devexit int rt5631_i2c_remove(struct i2c_client *client)
static int rt5631_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
return 0;
@ -1760,7 +1760,7 @@ static struct i2c_driver rt5631_i2c_driver = {
.owner = THIS_MODULE,
},
.probe = rt5631_i2c_probe,
.remove = __devexit_p(rt5631_i2c_remove),
.remove = rt5631_i2c_remove,
.id_table = rt5631_i2c_id,
};

8
sound/soc/codecs/sgtl5000.c
View File

@ -1404,8 +1404,8 @@ static struct snd_soc_codec_driver sgtl5000_driver = {
.num_dapm_routes = ARRAY_SIZE(sgtl5000_dapm_routes),
};
static __devinit int sgtl5000_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int sgtl5000_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct sgtl5000_priv *sgtl5000;
int ret;
@ -1422,7 +1422,7 @@ static __devinit int sgtl5000_i2c_probe(struct i2c_client *client,
return ret;
}
static __devexit int sgtl5000_i2c_remove(struct i2c_client *client)
static int sgtl5000_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
@ -1449,7 +1449,7 @@ static struct i2c_driver sgtl5000_i2c_driver = {
.of_match_table = sgtl5000_dt_ids,
},
.probe = sgtl5000_i2c_probe,
.remove = __devexit_p(sgtl5000_i2c_remove),
.remove = sgtl5000_i2c_remove,
.id_table = sgtl5000_id,
};

6
sound/soc/codecs/si476x.c
View File

@ -226,13 +226,13 @@ static struct snd_soc_codec_driver soc_codec_dev_si476x = {
.write = si476x_codec_write,
};
static int __devinit si476x_platform_probe(struct platform_device *pdev)
static int si476x_platform_probe(struct platform_device *pdev)
{
return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_si476x,
&si476x_dai, 1);
}
static int __devexit si476x_platform_remove(struct platform_device *pdev)
static int si476x_platform_remove(struct platform_device *pdev)
{
snd_soc_unregister_codec(&pdev->dev);
return 0;
@ -246,7 +246,7 @@ static struct platform_driver si476x_platform_driver = {
.owner = THIS_MODULE,
},
.probe = si476x_platform_probe,
.remove = __devexit_p(si476x_platform_remove),
.remove = si476x_platform_remove,
};
module_platform_driver(si476x_platform_driver);

6
sound/soc/codecs/sn95031.c
View File

@ -896,14 +896,14 @@ struct snd_soc_codec_driver sn95031_codec = {
.num_dapm_routes = ARRAY_SIZE(sn95031_audio_map),
};
static int __devinit sn95031_device_probe(struct platform_device *pdev)
static int sn95031_device_probe(struct platform_device *pdev)
{
pr_debug("codec device probe called for %s\n", dev_name(&pdev->dev));
return snd_soc_register_codec(&pdev->dev, &sn95031_codec,
sn95031_dais, ARRAY_SIZE(sn95031_dais));
}
static int __devexit sn95031_device_remove(struct platform_device *pdev)
static int sn95031_device_remove(struct platform_device *pdev)
{
pr_debug("codec device remove called\n");
snd_soc_unregister_codec(&pdev->dev);
@ -916,7 +916,7 @@ static struct platform_driver sn95031_codec_driver = {
.owner = THIS_MODULE,
},
.probe = sn95031_device_probe,
.remove = __devexit_p(sn95031_device_remove),
.remove = sn95031_device_remove,
};
module_platform_driver(sn95031_codec_driver);

12
sound/soc/codecs/ssm2602.c
View File

@ -691,7 +691,7 @@ static const struct regmap_config ssm2602_regmap_config = {
};
#if defined(CONFIG_SPI_MASTER)
static int __devinit ssm2602_spi_probe(struct spi_device *spi)
static int ssm2602_spi_probe(struct spi_device *spi)
{
struct ssm2602_priv *ssm2602;
int ret;
@ -713,7 +713,7 @@ static int __devinit ssm2602_spi_probe(struct spi_device *spi)
return ret;
}
static int __devexit ssm2602_spi_remove(struct spi_device *spi)
static int ssm2602_spi_remove(struct spi_device *spi)
{
snd_soc_unregister_codec(&spi->dev);
return 0;
@ -725,7 +725,7 @@ static struct spi_driver ssm2602_spi_driver = {
.owner = THIS_MODULE,
},
.probe = ssm2602_spi_probe,
.remove = __devexit_p(ssm2602_spi_remove),
.remove = ssm2602_spi_remove,
};
#endif
@ -736,7 +736,7 @@ static struct spi_driver ssm2602_spi_driver = {
* low = 0x1a
* high = 0x1b
*/
static int __devinit ssm2602_i2c_probe(struct i2c_client *i2c,
static int ssm2602_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
struct ssm2602_priv *ssm2602;
@ -759,7 +759,7 @@ static int __devinit ssm2602_i2c_probe(struct i2c_client *i2c,
return ret;
}
static int __devexit ssm2602_i2c_remove(struct i2c_client *client)
static int ssm2602_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
return 0;
@ -780,7 +780,7 @@ static struct i2c_driver ssm2602_i2c_driver = {
.owner = THIS_MODULE,
},
.probe = ssm2602_i2c_probe,
.remove = __devexit_p(ssm2602_i2c_remove),
.remove = ssm2602_i2c_remove,
.id_table = ssm2602_i2c_id,
};
#endif

8
sound/soc/codecs/sta32x.c
View File

@ -995,8 +995,8 @@ static const struct regmap_config sta32x_regmap = {
.volatile_reg = sta32x_reg_is_volatile,
};
static __devinit int sta32x_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int sta32x_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
struct sta32x_priv *sta32x;
int ret, i;
@ -1033,7 +1033,7 @@ static __devinit int sta32x_i2c_probe(struct i2c_client *i2c,
return ret;
}
static __devexit int sta32x_i2c_remove(struct i2c_client *client)
static int sta32x_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
return 0;
@ -1053,7 +1053,7 @@ static struct i2c_driver sta32x_i2c_driver = {
.owner = THIS_MODULE,
},
.probe = sta32x_i2c_probe,
.remove = __devexit_p(sta32x_i2c_remove),
.remove = sta32x_i2c_remove,
.id_table = sta32x_i2c_id,
};

8
sound/soc/codecs/sta529.c
View File

@ -380,8 +380,8 @@ static const struct regmap_config sta529_regmap = {
.num_reg_defaults = ARRAY_SIZE(sta529_reg_defaults),
};
static __devinit int sta529_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int sta529_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
struct sta529 *sta529;
int ret;
@ -412,7 +412,7 @@ static __devinit int sta529_i2c_probe(struct i2c_client *i2c,
return ret;
}
static int __devexit sta529_i2c_remove(struct i2c_client *client)
static int sta529_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
@ -431,7 +431,7 @@ static struct i2c_driver sta529_i2c_driver = {
.owner = THIS_MODULE,
},
.probe = sta529_i2c_probe,
.remove = __devexit_p(sta529_i2c_remove),
.remove = sta529_i2c_remove,
.id_table = sta529_i2c_id,
};

6
sound/soc/codecs/stac9766.c
View File

@ -385,13 +385,13 @@ static struct snd_soc_codec_driver soc_codec_dev_stac9766 = {
.reg_cache_default = stac9766_reg,
};
static __devinit int stac9766_probe(struct platform_device *pdev)
static int stac9766_probe(struct platform_device *pdev)
{
return snd_soc_register_codec(&pdev->dev,
&soc_codec_dev_stac9766, stac9766_dai, ARRAY_SIZE(stac9766_dai));
}
static int __devexit stac9766_remove(struct platform_device *pdev)
static int stac9766_remove(struct platform_device *pdev)
{
snd_soc_unregister_codec(&pdev->dev);
return 0;
@ -404,7 +404,7 @@ static struct platform_driver stac9766_codec_driver = {
},
.probe = stac9766_probe,
.remove = __devexit_p(stac9766_remove),
.remove = stac9766_remove,
};
module_platform_driver(stac9766_codec_driver);

8
sound/soc/codecs/tlv320aic32x4.c
View File

@ -716,8 +716,8 @@ static struct snd_soc_codec_driver soc_codec_dev_aic32x4 = {
.set_bias_level = aic32x4_set_bias_level,
};
static __devinit int aic32x4_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int aic32x4_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
struct aic32x4_pdata *pdata = i2c->dev.platform_data;
struct aic32x4_priv *aic32x4;
@ -748,7 +748,7 @@ static __devinit int aic32x4_i2c_probe(struct i2c_client *i2c,
return ret;
}
static __devexit int aic32x4_i2c_remove(struct i2c_client *client)
static int aic32x4_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
return 0;
@ -766,7 +766,7 @@ static struct i2c_driver aic32x4_i2c_driver = {
.owner = THIS_MODULE,
},
.probe = aic32x4_i2c_probe,
.remove = __devexit_p(aic32x4_i2c_remove),
.remove = aic32x4_i2c_remove,
.id_table = aic32x4_i2c_id,
};

8
sound/soc/codecs/tlv320dac33.c
View File

@ -1514,8 +1514,8 @@ static struct snd_soc_dai_driver dac33_dai = {
.ops = &dac33_dai_ops,
};
static int __devinit dac33_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int dac33_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct tlv320dac33_platform_data *pdata;
struct tlv320dac33_priv *dac33;
@ -1586,7 +1586,7 @@ err_gpio:
return ret;
}
static int __devexit dac33_i2c_remove(struct i2c_client *client)
static int dac33_i2c_remove(struct i2c_client *client)
{
struct tlv320dac33_priv *dac33 = i2c_get_clientdata(client);
@ -1617,7 +1617,7 @@ static struct i2c_driver tlv320dac33_i2c_driver = {
.owner = THIS_MODULE,
},
.probe = dac33_i2c_probe,
.remove = __devexit_p(dac33_i2c_remove),
.remove = dac33_i2c_remove,
.id_table = tlv320dac33_i2c_id,
};

8
sound/soc/codecs/tpa6130a2.c
View File

@ -359,8 +359,8 @@ int tpa6130a2_add_controls(struct snd_soc_codec *codec)
}
EXPORT_SYMBOL_GPL(tpa6130a2_add_controls);
static int __devinit tpa6130a2_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int tpa6130a2_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct device *dev;
struct tpa6130a2_data *data;
@ -455,7 +455,7 @@ err_gpio:
return ret;
}
static int __devexit tpa6130a2_remove(struct i2c_client *client)
static int tpa6130a2_remove(struct i2c_client *client)
{
struct tpa6130a2_data *data = i2c_get_clientdata(client);
@ -483,7 +483,7 @@ static struct i2c_driver tpa6130a2_i2c_driver = {
.owner = THIS_MODULE,
},
.probe = tpa6130a2_probe,
.remove = __devexit_p(tpa6130a2_remove),
.remove = tpa6130a2_remove,
.id_table = tpa6130a2_id,
};

6
sound/soc/codecs/twl4030.c
View File

@ -2334,13 +2334,13 @@ static struct snd_soc_codec_driver soc_codec_dev_twl4030 = {
.num_dapm_routes = ARRAY_SIZE(intercon),
};
static int __devinit twl4030_codec_probe(struct platform_device *pdev)
static int twl4030_codec_probe(struct platform_device *pdev)
{
return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_twl4030,
twl4030_dai, ARRAY_SIZE(twl4030_dai));
}
static int __devexit twl4030_codec_remove(struct platform_device *pdev)
static int twl4030_codec_remove(struct platform_device *pdev)
{
snd_soc_unregister_codec(&pdev->dev);
return 0;
@ -2350,7 +2350,7 @@ MODULE_ALIAS("platform:twl4030-codec");
static struct platform_driver twl4030_codec_driver = {
.probe = twl4030_codec_probe,
.remove = __devexit_p(twl4030_codec_remove),
.remove = twl4030_codec_remove,
.driver = {
.name = "twl4030-codec",
.owner = THIS_MODULE,

6
sound/soc/codecs/twl6040.c
View File

@ -1229,13 +1229,13 @@ static struct snd_soc_codec_driver soc_codec_dev_twl6040 = {
.num_dapm_routes = ARRAY_SIZE(intercon),
};
static int __devinit twl6040_codec_probe(struct platform_device *pdev)
static int twl6040_codec_probe(struct platform_device *pdev)
{
return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_twl6040,
twl6040_dai, ARRAY_SIZE(twl6040_dai));
}
static int __devexit twl6040_codec_remove(struct platform_device *pdev)
static int twl6040_codec_remove(struct platform_device *pdev)
{
snd_soc_unregister_codec(&pdev->dev);
return 0;
@ -1247,7 +1247,7 @@ static struct platform_driver twl6040_codec_driver = {
.owner = THIS_MODULE,
},
.probe = twl6040_codec_probe,
.remove = __devexit_p(twl6040_codec_remove),
.remove = twl6040_codec_remove,
};
module_platform_driver(twl6040_codec_driver);

6
sound/soc/codecs/uda134x.c
View File

@ -601,13 +601,13 @@ static struct snd_soc_codec_driver soc_codec_dev_uda134x = {
.set_bias_level = uda134x_set_bias_level,
};
static int __devinit uda134x_codec_probe(struct platform_device *pdev)
static int uda134x_codec_probe(struct platform_device *pdev)
{
return snd_soc_register_codec(&pdev->dev,
&soc_codec_dev_uda134x, &uda134x_dai, 1);
}
static int __devexit uda134x_codec_remove(struct platform_device *pdev)
static int uda134x_codec_remove(struct platform_device *pdev)
{
snd_soc_unregister_codec(&pdev->dev);
return 0;
@ -619,7 +619,7 @@ static struct platform_driver uda134x_codec_driver = {
.owner = THIS_MODULE,
},
.probe = uda134x_codec_probe,
.remove = __devexit_p(uda134x_codec_remove),
.remove = uda134x_codec_remove,
};
module_platform_driver(uda134x_codec_driver);

8
sound/soc/codecs/uda1380.c
View File

@ -795,8 +795,8 @@ static struct snd_soc_codec_driver soc_codec_dev_uda1380 = {
};
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
static __devinit int uda1380_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int uda1380_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
struct uda1380_priv *uda1380;
int ret;
@ -814,7 +814,7 @@ static __devinit int uda1380_i2c_probe(struct i2c_client *i2c,
return ret;
}
static int __devexit uda1380_i2c_remove(struct i2c_client *i2c)
static int uda1380_i2c_remove(struct i2c_client *i2c)
{
snd_soc_unregister_codec(&i2c->dev);
return 0;
@ -832,7 +832,7 @@ static struct i2c_driver uda1380_i2c_driver = {
.owner = THIS_MODULE,
},
.probe = uda1380_i2c_probe,
.remove = __devexit_p(uda1380_i2c_remove),
.remove = uda1380_i2c_remove,
.id_table = uda1380_i2c_id,
};
#endif

Some files were not shown because too many files have changed in this diff Show More