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

Commit f120a6fb authored by Bill Pemberton's avatar Bill Pemberton Committed by Takashi Iwai
Browse files

ALSA: oxygen: 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>
Acked-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 3dd06763

sound/pci/oxygen/oxygen.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -756,7 +756,7 @@ static const struct oxygen_model model_generic = { 
	.adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,

	.adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,

};

};





static int __devinit get_oxygen_model(struct oxygen *chip,

static int get_oxygen_model(struct oxygen *chip,

			    const struct pci_device_id *id)

			    const struct pci_device_id *id)

{

{

	static const char *const names[] = {

	static const char *const names[] = {
@@ -848,7 +848,7 @@ static int __devinit get_oxygen_model(struct oxygen *chip, 
	return 0;

	return 0;

}

}





static int __devinit generic_oxygen_probe(struct pci_dev *pci,

static int generic_oxygen_probe(struct pci_dev *pci,

				const struct pci_device_id *pci_id)

				const struct pci_device_id *pci_id)

{

{

	static int dev;

	static int dev;
@@ -871,7 +871,7 @@ static struct pci_driver oxygen_driver = { 
	.name = KBUILD_MODNAME,

	.name = KBUILD_MODNAME,

	.id_table = oxygen_ids,

	.id_table = oxygen_ids,

	.probe = generic_oxygen_probe,

	.probe = generic_oxygen_probe,

	.remove = __devexit_p(oxygen_pci_remove),

	.remove = oxygen_pci_remove,

#ifdef CONFIG_PM_SLEEP

#ifdef CONFIG_PM_SLEEP

	.driver = {

	.driver = {

		.pm = &oxygen_pci_pm,

		.pm = &oxygen_pci_pm,

sound/pci/oxygen/virtuoso.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -58,7 +58,7 @@ static DEFINE_PCI_DEVICE_TABLE(xonar_ids) = { 
};

};

MODULE_DEVICE_TABLE(pci, xonar_ids);

MODULE_DEVICE_TABLE(pci, xonar_ids);





static int __devinit get_xonar_model(struct oxygen *chip,

static int get_xonar_model(struct oxygen *chip,

			   const struct pci_device_id *id)

			   const struct pci_device_id *id)

{

{

	if (get_xonar_pcm179x_model(chip, id) >= 0)

	if (get_xonar_pcm179x_model(chip, id) >= 0)
@@ -70,7 +70,7 @@ static int __devinit get_xonar_model(struct oxygen *chip, 
	return -EINVAL;

	return -EINVAL;

}

}





static int __devinit xonar_probe(struct pci_dev *pci,

static int xonar_probe(struct pci_dev *pci,

		       const struct pci_device_id *pci_id)

		       const struct pci_device_id *pci_id)

{

{

	static int dev;

	static int dev;
@@ -93,7 +93,7 @@ static struct pci_driver xonar_driver = { 
	.name = KBUILD_MODNAME,

	.name = KBUILD_MODNAME,

	.id_table = xonar_ids,

	.id_table = xonar_ids,

	.probe = xonar_probe,

	.probe = xonar_probe,

	.remove = __devexit_p(oxygen_pci_remove),

	.remove = oxygen_pci_remove,

#ifdef CONFIG_PM_SLEEP

#ifdef CONFIG_PM_SLEEP

	.driver = {

	.driver = {

		.pm = &oxygen_pci_pm,

		.pm = &oxygen_pci_pm,

sound/pci/oxygen/xonar_cs43xx.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -431,7 +431,7 @@ static const struct oxygen_model model_xonar_d1 = { 
	.adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,

	.adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,

};

};





int __devinit get_xonar_cs43xx_model(struct oxygen *chip,

int get_xonar_cs43xx_model(struct oxygen *chip,

			   const struct pci_device_id *id)

			   const struct pci_device_id *id)

{

{

	switch (id->subdevice) {

	switch (id->subdevice) {

sound/pci/oxygen/xonar_pcm179x.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1087,7 +1087,7 @@ static const struct oxygen_model model_xonar_st = { 
	.adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,

	.adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,

};

};





int __devinit get_xonar_pcm179x_model(struct oxygen *chip,

int get_xonar_pcm179x_model(struct oxygen *chip,

			    const struct pci_device_id *id)

			    const struct pci_device_id *id)

{

{

	switch (id->subdevice) {

	switch (id->subdevice) {

sound/pci/oxygen/xonar_wm87x6.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1320,7 +1320,7 @@ static const struct oxygen_model model_xonar_hdav_slim = { 
	.adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,

	.adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,

};

};





int __devinit get_xonar_wm87x6_model(struct oxygen *chip,

int get_xonar_wm87x6_model(struct oxygen *chip,

			   const struct pci_device_id *id)

			   const struct pci_device_id *id)

{

{

	switch (id->subdevice) {

	switch (id->subdevice) {