commit: http://blackfin.uclinux.org/git/?p=linux-kernel;a=commitdiff;h=1b01395ad7ce798ceb6359ead62aa40b21f83bf0 branch: http://blackfin.uclinux.org/git/?p=linux-kernel;a=shortlog;h=refs/heads/trunk
Signed-off-by: Steven Miao <[email protected]> --- drivers/char/bfin_crc.c | 6 +++--- drivers/char/bfin_sport.c | 6 +++--- drivers/input/keyboard/adp5585-keys.c | 18 +++++++++--------- drivers/input/misc/adux1001-vibra.c | 6 +++--- drivers/input/touchscreen/ad7160-i2c.c | 6 +++--- drivers/input/touchscreen/ad7160-raw.c | 4 ++-- drivers/input/touchscreen/ad7160.c | 4 ++-- drivers/leds/leds-adp1650.c | 6 +++--- drivers/media/i2c/mt9m114.c | 6 +++--- drivers/media/platform/blackfin/bfin_display.c | 6 +++--- drivers/staging/icc/core/protocol.c | 6 +++--- drivers/video/bf609-nl8048.c | 8 ++++---- drivers/video/hitachi-tx09.c | 6 +++--- net/dsa/ksz8893m.c | 6 +++--- sound/soc/blackfin/bf5xx-ad73311.c | 6 +++--- sound/soc/blackfin/bf6xx-tdm-pcm.c | 6 +++--- sound/soc/blackfin/bf6xx-tdm.c | 6 +++--- sound/soc/blackfin/bfin-eval-adau1x61.c | 4 ++-- sound/soc/blackfin/bfin-eval-adau1x81.c | 4 ++-- sound/soc/codecs/ad74111.c | 4 ++-- sound/soc/codecs/adau1761.c | 12 ++++++------ sound/soc/codecs/adau1781.c | 12 ++++++------ sound/soc/codecs/adau17x1.c | 2 +- 23 files changed, 75 insertions(+), 75 deletions(-) diff --git a/drivers/char/bfin_crc.c b/drivers/char/bfin_crc.c index 4bdbd9d..02c67d7 100644 --- a/drivers/char/bfin_crc.c +++ b/drivers/char/bfin_crc.c @@ -406,7 +406,7 @@ static const struct file_operations bfin_crc_fops = { * Registers the misc device. Actual device * initialization is handled by bfin_crc_open(). */ -static int __devinit bfin_crc_probe(struct platform_device *pdev) +static int bfin_crc_probe(struct platform_device *pdev) { struct resource *res; struct bfin_crc *crc = NULL; @@ -487,7 +487,7 @@ out_error_free_mem: * Unregisters the misc device. Actual device * deinitialization is handled by bfin_crc_close(). */ -static int __devexit bfin_crc_remove(struct platform_device *pdev) +static int bfin_crc_remove(struct platform_device *pdev) { struct bfin_crc *crc = platform_get_drvdata(pdev); @@ -505,7 +505,7 @@ static int __devexit bfin_crc_remove(struct platform_device *pdev) static struct platform_driver bfin_crc_driver = { .probe = bfin_crc_probe, - .remove = __devexit_p(bfin_crc_remove), + .remove = bfin_crc_remove, .suspend = bfin_crc_suspend, .resume = bfin_crc_resume, .driver = { diff --git a/drivers/char/bfin_sport.c b/drivers/char/bfin_sport.c index 4f7909d..9c8ef2f 100644 --- a/drivers/char/bfin_sport.c +++ b/drivers/char/bfin_sport.c @@ -906,7 +906,7 @@ static int bfin_sport_resume(struct platform_device *dev) #define bfin_sport_resume NULL #endif -static int __devinit bfin_sport_probe(struct platform_device *pdev) +static int bfin_sport_probe(struct platform_device *pdev) { struct sport_dev *dev; struct miscdevice *misc; @@ -973,7 +973,7 @@ err: return ret; } -static int __devexit bfin_sport_remove(struct platform_device *pdev) +static int bfin_sport_remove(struct platform_device *pdev) { struct sport_dev *dev = platform_get_drvdata(pdev); int ret; @@ -993,7 +993,7 @@ static struct platform_driver bfin_sport_driver = { .owner = THIS_MODULE, }, .probe = bfin_sport_probe, - .remove = __devexit_p(bfin_sport_remove), + .remove = bfin_sport_remove, .suspend = bfin_sport_suspend, .resume = bfin_sport_resume, }; diff --git a/drivers/input/keyboard/adp5585-keys.c b/drivers/input/keyboard/adp5585-keys.c index 9165a91..3bff330 100644 --- a/drivers/input/keyboard/adp5585-keys.c +++ b/drivers/input/keyboard/adp5585-keys.c @@ -245,7 +245,7 @@ static int adp5585_gpio_direction_output(struct gpio_chip *chip, return ret; } -static int __devinit adp5585_build_gpiomap(struct adp5585_kpad *kpad, +static int adp5585_build_gpiomap(struct adp5585_kpad *kpad, const struct adp5585_kpad_platform_data *pdata) { bool pin_used[MAXGPIO]; @@ -277,7 +277,7 @@ static int __devinit adp5585_build_gpiomap(struct adp5585_kpad *kpad, return n_unused; } -static int __devinit adp5585_gpio_add(struct adp5585_kpad *kpad) +static int adp5585_gpio_add(struct adp5585_kpad *kpad) { struct device *dev = &kpad->client->dev; const struct adp5585_kpad_platform_data *pdata = dev->platform_data; @@ -331,7 +331,7 @@ static int __devinit adp5585_gpio_add(struct adp5585_kpad *kpad) return 0; } -static void __devexit adp5585_gpio_remove(struct adp5585_kpad *kpad) +static void adp5585_gpio_remove(struct adp5585_kpad *kpad) { struct device *dev = &kpad->client->dev; const struct adp5585_kpad_platform_data *pdata = dev->platform_data; @@ -415,7 +415,7 @@ static irqreturn_t adp5585_irq(int irq, void *handle) return IRQ_HANDLED; } -static int __devinit adp5585_get_evcode(struct adp5585_kpad *kpad, +static int adp5585_get_evcode(struct adp5585_kpad *kpad, unsigned short key) { int i; @@ -426,7 +426,7 @@ static int __devinit adp5585_get_evcode(struct adp5585_kpad *kpad, dev_err(&kpad->client->dev, "RESET/UNLOCK key not in keycode map\n"); return -EINVAL; } -static int __devinit adp5585_setup(struct adp5585_kpad *kpad) +static int adp5585_setup(struct adp5585_kpad *kpad) { struct i2c_client *client = kpad->client; const struct adp5585_kpad_platform_data *pdata = @@ -560,7 +560,7 @@ static int __devinit adp5585_setup(struct adp5585_kpad *kpad) return 0; } -static void __devinit adp5585_report_switch_state(struct adp5585_kpad *kpad) +static void adp5585_report_switch_state(struct adp5585_kpad *kpad) { int gpi_stat1 = adp5585_read(kpad->client, ADP5585_GPI_STATUS_A); int gpi_stat2 = adp5585_read(kpad->client, ADP5585_GPI_STATUS_B); @@ -593,7 +593,7 @@ static void __devinit adp5585_report_switch_state(struct adp5585_kpad *kpad) input_sync(kpad->input); } -static int __devinit adp5585_probe(struct i2c_client *client, +static int adp5585_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct adp5585_kpad *kpad; @@ -756,7 +756,7 @@ err_free_mem: return error; } -static int __devexit adp5585_remove(struct i2c_client *client) +static int adp5585_remove(struct i2c_client *client) { struct adp5585_kpad *kpad = i2c_get_clientdata(client); @@ -818,7 +818,7 @@ static struct i2c_driver adp5585_driver = { #endif }, .probe = adp5585_probe, - .remove = __devexit_p(adp5585_remove), + .remove = adp5585_remove, .id_table = adp5585_id, }; diff --git a/drivers/input/misc/adux1001-vibra.c b/drivers/input/misc/adux1001-vibra.c index c9072c1..32cb755 100644 --- a/drivers/input/misc/adux1001-vibra.c +++ b/drivers/input/misc/adux1001-vibra.c @@ -394,7 +394,7 @@ static int adux1001_play_effect(struct input_dev *dev, void *data, return 0; } -static int __devinit adux1001_probe(struct i2c_client *client, +static int adux1001_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct adux1001_chip *chip; @@ -522,7 +522,7 @@ err_free_mem: return ret; } -static int __devexit adux1001_remove(struct i2c_client *client) +static int adux1001_remove(struct i2c_client *client) { struct adux1001_chip *chip = i2c_get_clientdata(client); @@ -604,7 +604,7 @@ static struct i2c_driver adux1001_driver = { .owner = THIS_MODULE, }, .probe = adux1001_probe, - .remove = __devexit_p(adux1001_remove), + .remove = adux1001_remove, .id_table = adux1001_id, }; diff --git a/drivers/input/touchscreen/ad7160-i2c.c b/drivers/input/touchscreen/ad7160-i2c.c index 12ee072..057008d 100644 --- a/drivers/input/touchscreen/ad7160-i2c.c +++ b/drivers/input/touchscreen/ad7160-i2c.c @@ -138,7 +138,7 @@ static const struct ad7160_bus_ops bops = { .wakeup = ad7160_i2c_wakeup, }; -static int __devinit ad7160_i2c_probe(struct i2c_client *client, +static int ad7160_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id) { int ret; @@ -160,7 +160,7 @@ static int __devinit ad7160_i2c_probe(struct i2c_client *client, return ret; } -static int __devexit ad7160_i2c_remove(struct i2c_client *client) +static int ad7160_i2c_remove(struct i2c_client *client) { ad7160_remove_raw(&client->dev); return ad7160_remove(&client->dev); @@ -178,7 +178,7 @@ static struct i2c_driver ad7160_i2c_driver = { .owner = THIS_MODULE, }, .probe = ad7160_i2c_probe, - .remove = __devexit_p(ad7160_i2c_remove), + .remove = ad7160_i2c_remove, .suspend = ad7160_i2c_suspend, .resume = ad7160_i2c_resume, .id_table = ad7160_id, diff --git a/drivers/input/touchscreen/ad7160-raw.c b/drivers/input/touchscreen/ad7160-raw.c index 1051ac9..c75fc30 100644 --- a/drivers/input/touchscreen/ad7160-raw.c +++ b/drivers/input/touchscreen/ad7160-raw.c @@ -262,7 +262,7 @@ static struct miscdevice ad7160_raw_misc_device = { .fops = &ad7160_raw_misc_fops, }; -__devinit int +int ad7160_probe_raw(struct device *dev, struct ad7160_bus_data *bdata, u32 devid, u16 bustype) { @@ -307,7 +307,7 @@ ad7160_probe_raw(struct device *dev, struct ad7160_bus_data *bdata, return error; } -__devexit int ad7160_remove_raw(struct device *dev) +int ad7160_remove_raw(struct device *dev) { if (ad7160_raw_device.dev) { misc_deregister(&ad7160_raw_misc_device); diff --git a/drivers/input/touchscreen/ad7160.c b/drivers/input/touchscreen/ad7160.c index 4ac4e6f..6e661f2 100644 --- a/drivers/input/touchscreen/ad7160.c +++ b/drivers/input/touchscreen/ad7160.c @@ -905,7 +905,7 @@ static const struct attribute_group ad7160_attr_group = { .attrs = ad7160_attributes, }; -__devinit int +int ad7160_probe(struct device *dev, struct ad7160_bus_data *bdata, u32 devid, u16 bustype) { @@ -1085,7 +1085,7 @@ err_free_ts_mem: } EXPORT_SYMBOL(ad7160_probe); -__devexit int ad7160_remove(struct device *dev) +int ad7160_remove(struct device *dev) { struct ad7160 *ts = dev_get_drvdata(dev); diff --git a/drivers/leds/leds-adp1650.c b/drivers/leds/leds-adp1650.c index 469f268..398d8d7 100644 --- a/drivers/leds/leds-adp1650.c +++ b/drivers/leds/leds-adp1650.c @@ -225,7 +225,7 @@ static void adp1650_brightness_set(struct led_classdev *led_cdev, adp1650_led_mode_set(chip->client, brightness); } -static int __devinit adp1650_probe(struct i2c_client *client, +static int adp1650_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct adp1650_chip *chip; @@ -307,7 +307,7 @@ err_free_mem: return ret; } -static int __devexit adp1650_remove(struct i2c_client *client) +static int adp1650_remove(struct i2c_client *client) { struct adp1650_chip *chip = i2c_get_clientdata(client); @@ -379,7 +379,7 @@ static struct i2c_driver adp1650_driver = { .owner = THIS_MODULE, }, .probe = adp1650_probe, - .remove = __devexit_p(adp1650_remove), + .remove = adp1650_remove, .id_table = adp1650_id, }; diff --git a/drivers/media/i2c/mt9m114.c b/drivers/media/i2c/mt9m114.c index 564b711..6516302 100644 --- a/drivers/media/i2c/mt9m114.c +++ b/drivers/media/i2c/mt9m114.c @@ -920,7 +920,7 @@ static const struct v4l2_subdev_ops mt9m114_ops = { .video = &mt9m114_video_ops, }; -static int __devinit mt9m114_probe(struct i2c_client *client, +static int mt9m114_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct mt9m114 *sensor; @@ -1020,7 +1020,7 @@ static int __devinit mt9m114_probe(struct i2c_client *client, return ret; } -static int __devexit mt9m114_remove(struct i2c_client *client) +static int mt9m114_remove(struct i2c_client *client) { struct v4l2_subdev *sd = i2c_get_clientdata(client); struct mt9m114 *sensor = to_mt9m114(sd); @@ -1044,7 +1044,7 @@ static struct i2c_driver mt9m114_driver = { .name = "mt9m114", }, .probe = mt9m114_probe, - .remove = __devexit_p(mt9m114_remove), + .remove = mt9m114_remove, .id_table = mt9m114_id, }; diff --git a/drivers/media/platform/blackfin/bfin_display.c b/drivers/media/platform/blackfin/bfin_display.c index 91738db..6ae1203 100644 --- a/drivers/media/platform/blackfin/bfin_display.c +++ b/drivers/media/platform/blackfin/bfin_display.c @@ -908,7 +908,7 @@ static struct v4l2_file_operations disp_fops = { .poll = disp_poll }; -static int __devinit disp_probe(struct platform_device *pdev) +static int disp_probe(struct platform_device *pdev) { struct disp_device *disp; struct video_device *vfd; @@ -1105,7 +1105,7 @@ err_free_dev: return ret; } -static int __devexit disp_remove(struct platform_device *pdev) +static int disp_remove(struct platform_device *pdev) { struct v4l2_device *v4l2_dev = platform_get_drvdata(pdev); struct disp_device *disp = container_of(v4l2_dev, @@ -1127,7 +1127,7 @@ static struct platform_driver disp_driver = { .owner = THIS_MODULE, }, .probe = disp_probe, - .remove = __devexit_p(disp_remove), + .remove = disp_remove, }; module_platform_driver(disp_driver); diff --git a/drivers/staging/icc/core/protocol.c b/drivers/staging/icc/core/protocol.c index a2ec26c..bf3fafc 100644 --- a/drivers/staging/icc/core/protocol.c +++ b/drivers/staging/icc/core/protocol.c @@ -1845,7 +1845,7 @@ static irqreturn_t ipi_handler_int0(int irq, void *dev_instance) return IRQ_HANDLED; } -static int __devinit bfin_icc_probe(struct platform_device *pdev) +static int bfin_icc_probe(struct platform_device *pdev) { struct icc_platform_data *icc_data = (struct icc_platform_data *)pdev->dev.platform_data; struct bfin_icc *icc = NULL; @@ -1955,7 +1955,7 @@ out_error_free_mem: return ret; } -static int __devexit bfin_icc_remove(struct platform_device *pdev) +static int bfin_icc_remove(struct platform_device *pdev) { struct bfin_icc *icc = platform_get_drvdata(pdev); struct sm_icc_desc *icc_info; @@ -1980,7 +1980,7 @@ static int __devexit bfin_icc_remove(struct platform_device *pdev) static struct platform_driver bfin_icc_driver = { .probe = bfin_icc_probe, - .remove = __devexit_p(bfin_icc_remove), + .remove = bfin_icc_remove, .driver = { .name = DRIVER_NAME, .owner = THIS_MODULE, diff --git a/drivers/video/bf609-nl8048.c b/drivers/video/bf609-nl8048.c index 716550d..47b3b13 100644 --- a/drivers/video/bf609-nl8048.c +++ b/drivers/video/bf609-nl8048.c @@ -84,7 +84,7 @@ static const unsigned short eppi2_per_data[] = { P_PPI2_D16, P_PPI2_D17, 0, }; -static struct fb_fix_screeninfo bfin_fb_fix __devinitdata = { +static struct fb_fix_screeninfo bfin_fb_fix = { .id = KBUILD_MODNAME, .type = FB_TYPE_PACKED_PIXELS, .visual = FB_VISUAL_TRUECOLOR, @@ -471,7 +471,7 @@ static struct fb_ops bfin_fb_ops = { .fb_cursor = bfin_fb_cursor, }; -static int __devinit bfin_nl8048_probe(struct platform_device *pdev) +static int bfin_nl8048_probe(struct platform_device *pdev) { struct fb_info *info; struct bfin_fb_par *par; @@ -560,7 +560,7 @@ err: return ret; } -static int __devexit bfin_nl8048_remove(struct platform_device *pdev) +static int bfin_nl8048_remove(struct platform_device *pdev) { struct fb_info *info = platform_get_drvdata(pdev); @@ -601,7 +601,7 @@ static int bfin_nl8048_resume(struct platform_device *pdev) static struct platform_driver bfin_nl8048_driver = { .probe = bfin_nl8048_probe, - .remove = __devexit_p(bfin_nl8048_remove), + .remove = bfin_nl8048_remove, .suspend = bfin_nl8048_suspend, .resume = bfin_nl8048_resume, .driver = { diff --git a/drivers/video/hitachi-tx09.c b/drivers/video/hitachi-tx09.c index 654dc60..99d3df0 100644 --- a/drivers/video/hitachi-tx09.c +++ b/drivers/video/hitachi-tx09.c @@ -581,7 +581,7 @@ static const struct backlight_ops tx09fb_bl_ops = { .update_status = bl_update_properties, }; -static int __devinit tx09_probe(struct platform_device *pdev) +static int tx09_probe(struct platform_device *pdev) { struct backlight_properties props; int dma_desc_len; @@ -678,7 +678,7 @@ static int __devinit tx09_probe(struct platform_device *pdev) return 0; } -static int __devexit tx09_remove(struct platform_device *pdev) +static int tx09_remove(struct platform_device *pdev) { pr_debug("%s\n", __func__); @@ -743,7 +743,7 @@ static int tx09_resume(struct platform_device *pdev) static struct platform_driver tx09_driver = { .probe = tx09_probe, - .remove = __devexit_p(tx09_remove), + .remove = tx09_remove, .suspend = tx09_suspend, .resume = tx09_resume, .driver = { diff --git a/net/dsa/ksz8893m.c b/net/dsa/ksz8893m.c index 1c7f0eb..8bdddfc 100644 --- a/net/dsa/ksz8893m.c +++ b/net/dsa/ksz8893m.c @@ -278,7 +278,7 @@ static void ksz8893m_poll_link(struct dsa_switch *ds) } } -static int __devinit spi_switch_probe(struct spi_device *spi) +static int spi_switch_probe(struct spi_device *spi) { if (sw.dev) { pr_err("only one instance supported at a time\n"); @@ -289,7 +289,7 @@ static int __devinit spi_switch_probe(struct spi_device *spi) return 0; } -static int __devexit spi_switch_remove(struct spi_device *spi) +static int spi_switch_remove(struct spi_device *spi) { sw.dev = NULL; return 0; @@ -302,7 +302,7 @@ static struct spi_driver spi_switch_driver = { .owner = THIS_MODULE, }, .probe = spi_switch_probe, - .remove = __devexit_p(spi_switch_remove), + .remove = spi_switch_remove, }; static struct dsa_switch_driver ksz8893m_switch_driver = { diff --git a/sound/soc/blackfin/bf5xx-ad73311.c b/sound/soc/blackfin/bf5xx-ad73311.c index a1aafb6..48c11dd 100644 --- a/sound/soc/blackfin/bf5xx-ad73311.c +++ b/sound/soc/blackfin/bf5xx-ad73311.c @@ -201,7 +201,7 @@ static struct snd_soc_card bf5xx_ad73311 = { .num_links = 1, }; -static __devinit int bf5xx_ad73311_driver_probe(struct platform_device *pdev) +static int bf5xx_ad73311_driver_probe(struct platform_device *pdev) { struct snd_soc_card *card = &bf5xx_ad73311; const unsigned *gpio; @@ -253,7 +253,7 @@ err_free_se: return ret; } -static int __devexit bf5xx_ad73311_driver_remove(struct platform_device *pdev) +static int bf5xx_ad73311_driver_remove(struct platform_device *pdev) { struct snd_soc_card *card = platform_get_drvdata(pdev); @@ -271,7 +271,7 @@ static struct platform_driver bf5xx_ad73311_driver = { .pm = &snd_soc_pm_ops, }, .probe = bf5xx_ad73311_driver_probe, - .remove = __devexit_p(bf5xx_ad73311_driver_remove), + .remove = bf5xx_ad73311_driver_remove, }; static int __init bf5xx_ad73311_init(void) diff --git a/sound/soc/blackfin/bf6xx-tdm-pcm.c b/sound/soc/blackfin/bf6xx-tdm-pcm.c index f197abd..fbaed65 100644 --- a/sound/soc/blackfin/bf6xx-tdm-pcm.c +++ b/sound/soc/blackfin/bf6xx-tdm-pcm.c @@ -291,12 +291,12 @@ static struct snd_soc_platform_driver bfin_tdm_pcm_platform = { .pcm_free = bfin_tdm_pcm_free, }; -static int __devinit bfin_tdm_pcm_probe(struct platform_device *pdev) +static int bfin_tdm_pcm_probe(struct platform_device *pdev) { return snd_soc_register_platform(&pdev->dev, &bfin_tdm_pcm_platform); } -static int __devexit bfin_tdm_pcm_remove(struct platform_device *pdev) +static int bfin_tdm_pcm_remove(struct platform_device *pdev) { snd_soc_unregister_platform(&pdev->dev); return 0; @@ -308,7 +308,7 @@ static struct platform_driver bfin_tdm_pcm_driver = { .owner = THIS_MODULE, }, .probe = bfin_tdm_pcm_probe, - .remove = __devexit_p(bfin_tdm_pcm_remove), + .remove = bfin_tdm_pcm_remove, }; module_platform_driver(bfin_tdm_pcm_driver); diff --git a/sound/soc/blackfin/bf6xx-tdm.c b/sound/soc/blackfin/bf6xx-tdm.c index 4d001fe..07349c2 100644 --- a/sound/soc/blackfin/bf6xx-tdm.c +++ b/sound/soc/blackfin/bf6xx-tdm.c @@ -179,7 +179,7 @@ static struct snd_soc_dai_driver bfin_tdm_dai = { .ops = &bfin_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; struct device *dev = &pdev->dev; @@ -201,7 +201,7 @@ static int __devinit bfin_tdm_probe(struct platform_device *pdev) return 0; } -static int __devexit bfin_tdm_remove(struct platform_device *pdev) +static int bfin_tdm_remove(struct platform_device *pdev) { struct sport_device *sport = platform_get_drvdata(pdev); @@ -213,7 +213,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, diff --git a/sound/soc/blackfin/bfin-eval-adau1x61.c b/sound/soc/blackfin/bfin-eval-adau1x61.c index 64f2216..1be7d5d 100644 --- a/sound/soc/blackfin/bfin-eval-adau1x61.c +++ b/sound/soc/blackfin/bfin-eval-adau1x61.c @@ -138,7 +138,7 @@ static int bfin_eval_adau1x61_probe(struct platform_device *pdev) return snd_soc_register_card(card); } -static int __devexit bfin_eval_adau1x61_remove(struct platform_device *pdev) +static int bfin_eval_adau1x61_remove(struct platform_device *pdev) { struct snd_soc_card *card = platform_get_drvdata(pdev); @@ -155,7 +155,7 @@ static struct platform_driver bfin_eval_adau1x61_driver = { .pm = &snd_soc_pm_ops, }, .probe = bfin_eval_adau1x61_probe, - .remove = __devexit_p(bfin_eval_adau1x61_remove), + .remove = bfin_eval_adau1x61_remove, }; module_platform_driver(bfin_eval_adau1x61_driver); diff --git a/sound/soc/blackfin/bfin-eval-adau1x81.c b/sound/soc/blackfin/bfin-eval-adau1x81.c index cb898a3..4f55393 100644 --- a/sound/soc/blackfin/bfin-eval-adau1x81.c +++ b/sound/soc/blackfin/bfin-eval-adau1x81.c @@ -125,7 +125,7 @@ static int bfin_eval_adau1x81_probe(struct platform_device *pdev) return snd_soc_register_card(card); } -static int __devexit bfin_eval_adau1x81_remove(struct platform_device *pdev) +static int bfin_eval_adau1x81_remove(struct platform_device *pdev) { struct snd_soc_card *card = platform_get_drvdata(pdev); @@ -142,7 +142,7 @@ static struct platform_driver bfin_eval_adau1x81_driver = { .pm = &snd_soc_pm_ops, }, .probe = bfin_eval_adau1x81_probe, - .remove = __devexit_p(bfin_eval_adau1x81_remove), + .remove = bfin_eval_adau1x81_remove, }; module_platform_driver(bfin_eval_adau1x81_driver) diff --git a/sound/soc/codecs/ad74111.c b/sound/soc/codecs/ad74111.c index 352f27b..e130832 100644 --- a/sound/soc/codecs/ad74111.c +++ b/sound/soc/codecs/ad74111.c @@ -43,7 +43,7 @@ static int ad74111_probe(struct platform_device *pdev) &soc_codec_dev_ad74111, &ad74111_dai, 1); } -static int __devexit ad74111_remove(struct platform_device *pdev) +static int ad74111_remove(struct platform_device *pdev) { snd_soc_unregister_codec(&pdev->dev); return 0; @@ -56,7 +56,7 @@ static struct platform_driver ad74111_codec_driver = { }, .probe = ad74111_probe, - .remove = __devexit_p(ad74111_remove), + .remove = ad74111_remove, }; static int __init ad74111_init(void) diff --git a/sound/soc/codecs/adau1761.c b/sound/soc/codecs/adau1761.c index 6cc1a4f..175bed2 100644 --- a/sound/soc/codecs/adau1761.c +++ b/sound/soc/codecs/adau1761.c @@ -753,7 +753,7 @@ static const struct regmap_config adau1761_spi_regmap_config = { .cache_type = REGCACHE_RBTREE, }; -static int __devinit adau1761_spi_probe(struct spi_device *spi) +static int adau1761_spi_probe(struct spi_device *spi) { enum adau17x1_type type = spi_get_device_id(spi)->driver_data; struct snd_soc_dai_driver *dai_drv; @@ -784,7 +784,7 @@ err_remove: return ret; } -static int __devexit adau1761_spi_remove(struct spi_device *spi) +static int adau1761_spi_remove(struct spi_device *spi) { snd_soc_unregister_codec(&spi->dev); adau17x1_bus_remove(&spi->dev); @@ -806,7 +806,7 @@ static struct spi_driver adau1761_spi_driver = { .owner = THIS_MODULE, }, .probe = adau1761_spi_probe, - .remove = __devexit_p(adau1761_spi_remove), + .remove = adau1761_spi_remove, .id_table = adau1761_spi_id, }; @@ -838,7 +838,7 @@ static const struct regmap_config adau1761_i2c_regmap_config = { .cache_type = REGCACHE_RBTREE, }; -static int __devinit adau1761_i2c_probe(struct i2c_client *client, +static int adau1761_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id) { enum adau17x1_type type = id->driver_data; @@ -870,7 +870,7 @@ err_remove: return ret; } -static int __devexit adau1761_i2c_remove(struct i2c_client *client) +static int adau1761_i2c_remove(struct i2c_client *client) { snd_soc_unregister_codec(&client->dev); adau17x1_bus_remove(&client->dev); @@ -892,7 +892,7 @@ static struct i2c_driver adau1761_i2c_driver = { .owner = THIS_MODULE, }, .probe = adau1761_i2c_probe, - .remove = __devexit_p(adau1761_i2c_remove), + .remove = adau1761_i2c_remove, .id_table = adau1761_i2c_id, }; diff --git a/sound/soc/codecs/adau1781.c b/sound/soc/codecs/adau1781.c index a25a0c9..5eed6c7 100644 --- a/sound/soc/codecs/adau1781.c +++ b/sound/soc/codecs/adau1781.c @@ -493,7 +493,7 @@ static const struct regmap_config adau1781_spi_regmap_config = { .cache_type = REGCACHE_RBTREE, }; -static int __devinit adau1781_spi_probe(struct spi_device *spi) +static int adau1781_spi_probe(struct spi_device *spi) { struct regmap *regmap; enum adau17x1_type type = spi_get_device_id(spi)->driver_data; @@ -518,7 +518,7 @@ err_remove: return ret; } -static int __devexit adau1781_spi_remove(struct spi_device *spi) +static int adau1781_spi_remove(struct spi_device *spi) { snd_soc_unregister_codec(&spi->dev); adau17x1_bus_remove(&spi->dev); @@ -538,7 +538,7 @@ static struct spi_driver adau1781_spi_driver = { .owner = THIS_MODULE, }, .probe = adau1781_spi_probe, - .remove = __devexit_p(adau1781_spi_remove), + .remove = adau1781_spi_remove, .id_table = adau1781_spi_id, }; @@ -570,7 +570,7 @@ static const struct regmap_config adau1781_i2c_regmap_config = { .cache_type = REGCACHE_RBTREE, }; -static int __devinit adau1781_i2c_probe(struct i2c_client *client, +static int adau1781_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct regmap *regmap; @@ -596,7 +596,7 @@ err_remove: return ret; } -static int __devexit adau1781_i2c_remove(struct i2c_client *client) +static int adau1781_i2c_remove(struct i2c_client *client) { snd_soc_unregister_codec(&client->dev); adau17x1_bus_remove(&client->dev); @@ -616,7 +616,7 @@ static struct i2c_driver adau1781_i2c_driver = { .owner = THIS_MODULE, }, .probe = adau1781_i2c_probe, - .remove = __devexit_p(adau1781_i2c_remove), + .remove = adau1781_i2c_remove, .id_table = adau1781_i2c_id, }; diff --git a/sound/soc/codecs/adau17x1.c b/sound/soc/codecs/adau17x1.c index 1fe1645..ff7c1dd 100644 --- a/sound/soc/codecs/adau17x1.c +++ b/sound/soc/codecs/adau17x1.c @@ -829,7 +829,7 @@ int adau17x1_resume(struct snd_soc_codec *codec) } EXPORT_SYMBOL_GPL(adau17x1_resume); -int __devinit adau17x1_bus_probe(struct device *dev, struct regmap *regmap, +int adau17x1_bus_probe(struct device *dev, struct regmap *regmap, enum adau17x1_type type, enum snd_soc_control_type control_type) { struct adau *adau;
_______________________________________________ Linux-kernel-commits mailing list [email protected] https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
