Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a79e94e authored by Bill Pemberton's avatar Bill Pemberton Committed by Mark Brown
Browse files

ASoC: codecs: remove __dev* attributes 



CONFIG_HOTPLUG is going away as an option.  As result the __dev*
markings will be going away.

Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
and __devexit.

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent e51e97ee

sound/soc/codecs/88pm860x-codec.c

+3 −3
Original line number Diff line number Diff line
@@ -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 @@ static int __devinit pm860x_codec_probe(struct platform_device *pdev) 
	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);

sound/soc/codecs/ab8500-codec.c

+3 −3
Original line number Diff line number Diff line
@@ -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,

};

sound/soc/codecs/ac97.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

sound/soc/codecs/ad1836.c

+3 −3
Original line number Diff line number Diff line
@@ -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,

};

sound/soc/codecs/ad193x.c

+7 −7
Original line number Diff line number Diff line
@@ -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,7 +430,7 @@ static const struct i2c_device_id ad193x_id[] = { 
};

MODULE_DEVICE_TABLE(i2c, ad193x_id);



static int __devinit ad193x_i2c_probe(struct i2c_client *client,

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