提交 3dd06763 编写于 作者: B Bill Pemberton 提交者: Takashi Iwai

ALSA: bt87X: 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: NBill Pemberton <wfp5p@virginia.edu>
Acked-by: NClemens Ladisch <clemens@ladisch.de>
Signed-off-by: NTakashi Iwai <tiwai@suse.de>
上级 2f5c1302
...@@ -164,7 +164,7 @@ struct snd_bt87x_board { ...@@ -164,7 +164,7 @@ struct snd_bt87x_board {
unsigned no_digital:1; /* No digital input */ unsigned no_digital:1; /* No digital input */
}; };
static __devinitdata struct snd_bt87x_board snd_bt87x_boards[] = { static struct snd_bt87x_board snd_bt87x_boards[] = {
[SND_BT87X_BOARD_UNKNOWN] = { [SND_BT87X_BOARD_UNKNOWN] = {
.dig_rate = 32000, /* just a guess */ .dig_rate = 32000, /* just a guess */
}, },
...@@ -696,7 +696,7 @@ static int snd_bt87x_dev_free(struct snd_device *device) ...@@ -696,7 +696,7 @@ static int snd_bt87x_dev_free(struct snd_device *device)
return snd_bt87x_free(chip); return snd_bt87x_free(chip);
} }
static int __devinit snd_bt87x_pcm(struct snd_bt87x *chip, int device, char *name) static int snd_bt87x_pcm(struct snd_bt87x *chip, int device, char *name)
{ {
int err; int err;
struct snd_pcm *pcm; struct snd_pcm *pcm;
...@@ -714,9 +714,9 @@ static int __devinit snd_bt87x_pcm(struct snd_bt87x *chip, int device, char *nam ...@@ -714,9 +714,9 @@ static int __devinit snd_bt87x_pcm(struct snd_bt87x *chip, int device, char *nam
ALIGN(255 * 4092, 1024)); ALIGN(255 * 4092, 1024));
} }
static int __devinit snd_bt87x_create(struct snd_card *card, static int snd_bt87x_create(struct snd_card *card,
struct pci_dev *pci, struct pci_dev *pci,
struct snd_bt87x **rchip) struct snd_bt87x **rchip)
{ {
struct snd_bt87x *chip; struct snd_bt87x *chip;
int err; int err;
...@@ -822,7 +822,7 @@ MODULE_DEVICE_TABLE(pci, snd_bt87x_ids); ...@@ -822,7 +822,7 @@ MODULE_DEVICE_TABLE(pci, snd_bt87x_ids);
* (DVB cards use the audio function to transfer MPEG data) */ * (DVB cards use the audio function to transfer MPEG data) */
static struct { static struct {
unsigned short subvendor, subdevice; unsigned short subvendor, subdevice;
} blacklist[] __devinitdata = { } blacklist[] = {
{0x0071, 0x0101}, /* Nebula Electronics DigiTV */ {0x0071, 0x0101}, /* Nebula Electronics DigiTV */
{0x11bd, 0x001c}, /* Pinnacle PCTV Sat */ {0x11bd, 0x001c}, /* Pinnacle PCTV Sat */
{0x11bd, 0x0026}, /* Pinnacle PCTV SAT CI */ {0x11bd, 0x0026}, /* Pinnacle PCTV SAT CI */
...@@ -837,7 +837,7 @@ static struct { ...@@ -837,7 +837,7 @@ static struct {
}; };
/* return the id of the card, or a negative value if it's blacklisted */ /* return the id of the card, or a negative value if it's blacklisted */
static int __devinit snd_bt87x_detect_card(struct pci_dev *pci) static int snd_bt87x_detect_card(struct pci_dev *pci)
{ {
int i; int i;
const struct pci_device_id *supported; const struct pci_device_id *supported;
...@@ -862,8 +862,8 @@ static int __devinit snd_bt87x_detect_card(struct pci_dev *pci) ...@@ -862,8 +862,8 @@ static int __devinit snd_bt87x_detect_card(struct pci_dev *pci)
return SND_BT87X_BOARD_UNKNOWN; return SND_BT87X_BOARD_UNKNOWN;
} }
static int __devinit snd_bt87x_probe(struct pci_dev *pci, static int snd_bt87x_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;
struct snd_card *card; struct snd_card *card;
...@@ -948,7 +948,7 @@ static int __devinit snd_bt87x_probe(struct pci_dev *pci, ...@@ -948,7 +948,7 @@ static int __devinit snd_bt87x_probe(struct pci_dev *pci,
return err; return err;
} }
static void __devexit snd_bt87x_remove(struct pci_dev *pci) static void snd_bt87x_remove(struct pci_dev *pci)
{ {
snd_card_free(pci_get_drvdata(pci)); snd_card_free(pci_get_drvdata(pci));
pci_set_drvdata(pci, NULL); pci_set_drvdata(pci, NULL);
...@@ -966,7 +966,7 @@ static struct pci_driver bt87x_driver = { ...@@ -966,7 +966,7 @@ static struct pci_driver bt87x_driver = {
.name = KBUILD_MODNAME, .name = KBUILD_MODNAME,
.id_table = snd_bt87x_ids, .id_table = snd_bt87x_ids,
.probe = snd_bt87x_probe, .probe = snd_bt87x_probe,
.remove = __devexit_p(snd_bt87x_remove), .remove = snd_bt87x_remove,
}; };
module_pci_driver(bt87x_driver); module_pci_driver(bt87x_driver);
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册