Browse Source

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: Bill Pemberton <wfp5p@virginia.edu>
Acked-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
imx_3.10.17_1.0.0_ga
Bill Pemberton 8 years ago
committed by Takashi Iwai
parent
commit
f120a6fb48
5 changed files with 16 additions and 16 deletions
  1. +5
    -5
      sound/pci/oxygen/oxygen.c
  2. +5
    -5
      sound/pci/oxygen/virtuoso.c
  3. +2
    -2
      sound/pci/oxygen/xonar_cs43xx.c
  4. +2
    -2
      sound/pci/oxygen/xonar_pcm179x.c
  5. +2
    -2
      sound/pci/oxygen/xonar_wm87x6.c

+ 5
- 5
sound/pci/oxygen/oxygen.c View File

@ -756,8 +756,8 @@ static const struct oxygen_model model_generic = {
.adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
};
static int __devinit get_oxygen_model(struct oxygen *chip,
const struct pci_device_id *id)
static int get_oxygen_model(struct oxygen *chip,
const struct pci_device_id *id)
{
static const char *const names[] = {
[MODEL_MERIDIAN] = "AuzenTech X-Meridian",
@ -848,8 +848,8 @@ static int __devinit get_oxygen_model(struct oxygen *chip,
return 0;
}
static int __devinit generic_oxygen_probe(struct pci_dev *pci,
const struct pci_device_id *pci_id)
static int generic_oxygen_probe(struct pci_dev *pci,
const struct pci_device_id *pci_id)
{
static int dev;
int err;
@ -871,7 +871,7 @@ static struct pci_driver oxygen_driver = {
.name = KBUILD_MODNAME,
.id_table = oxygen_ids,
.probe = generic_oxygen_probe,
.remove = __devexit_p(oxygen_pci_remove),
.remove = oxygen_pci_remove,
#ifdef CONFIG_PM_SLEEP
.driver = {
.pm = &oxygen_pci_pm,


+ 5
- 5
sound/pci/oxygen/virtuoso.c View File

@ -58,8 +58,8 @@ static DEFINE_PCI_DEVICE_TABLE(xonar_ids) = {
};
MODULE_DEVICE_TABLE(pci, xonar_ids);
static int __devinit get_xonar_model(struct oxygen *chip,
const struct pci_device_id *id)
static int get_xonar_model(struct oxygen *chip,
const struct pci_device_id *id)
{
if (get_xonar_pcm179x_model(chip, id) >= 0)
return 0;
@ -70,8 +70,8 @@ static int __devinit get_xonar_model(struct oxygen *chip,
return -EINVAL;
}
static int __devinit xonar_probe(struct pci_dev *pci,
const struct pci_device_id *pci_id)
static int xonar_probe(struct pci_dev *pci,
const struct pci_device_id *pci_id)
{
static int dev;
int err;
@ -93,7 +93,7 @@ static struct pci_driver xonar_driver = {
.name = KBUILD_MODNAME,
.id_table = xonar_ids,
.probe = xonar_probe,
.remove = __devexit_p(oxygen_pci_remove),
.remove = oxygen_pci_remove,
#ifdef CONFIG_PM_SLEEP
.driver = {
.pm = &oxygen_pci_pm,


+ 2
- 2
sound/pci/oxygen/xonar_cs43xx.c View File

@ -431,8 +431,8 @@ static const struct oxygen_model model_xonar_d1 = {
.adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
};
int __devinit get_xonar_cs43xx_model(struct oxygen *chip,
const struct pci_device_id *id)
int get_xonar_cs43xx_model(struct oxygen *chip,
const struct pci_device_id *id)
{
switch (id->subdevice) {
case 0x834f:


+ 2
- 2
sound/pci/oxygen/xonar_pcm179x.c View File

@ -1087,8 +1087,8 @@ static const struct oxygen_model model_xonar_st = {
.adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
};
int __devinit get_xonar_pcm179x_model(struct oxygen *chip,
const struct pci_device_id *id)
int get_xonar_pcm179x_model(struct oxygen *chip,
const struct pci_device_id *id)
{
switch (id->subdevice) {
case 0x8269:


+ 2
- 2
sound/pci/oxygen/xonar_wm87x6.c View File

@ -1320,8 +1320,8 @@ static const struct oxygen_model model_xonar_hdav_slim = {
.adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
};
int __devinit get_xonar_wm87x6_model(struct oxygen *chip,
const struct pci_device_id *id)
int get_xonar_wm87x6_model(struct oxygen *chip,
const struct pci_device_id *id)
{
switch (id->subdevice) {
case 0x838e:


Loading…
Cancel
Save