diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-21 23:03:34 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-16 12:24:44 -0400 |
| commit | abe9ab8f62203ced11119fb96acc3b8dd107ebc4 (patch) | |
| tree | cb6d6667e6fc216efdfa5b1ba4a3e46c92798090 /sound/oss/soundcard.c | |
| parent | d73a1a674b5383bb3b38ae3dd625504ffc623d90 (diff) | |
device create: sound: convert device_create_drvdata to device_create
Now that device_create() has been audited, rename things back to the
original call to be sane.
Cc: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'sound/oss/soundcard.c')
| -rw-r--r-- | sound/oss/soundcard.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c index 7d89c081a086..61aaedae6b7e 100644 --- a/sound/oss/soundcard.c +++ b/sound/oss/soundcard.c | |||
| @@ -560,19 +560,18 @@ static int __init oss_init(void) | |||
| 560 | sound_dmap_flag = (dmabuf > 0 ? 1 : 0); | 560 | sound_dmap_flag = (dmabuf > 0 ? 1 : 0); |
| 561 | 561 | ||
| 562 | for (i = 0; i < ARRAY_SIZE(dev_list); i++) { | 562 | for (i = 0; i < ARRAY_SIZE(dev_list); i++) { |
| 563 | device_create_drvdata(sound_class, NULL, | 563 | device_create(sound_class, NULL, |
| 564 | MKDEV(SOUND_MAJOR, dev_list[i].minor), | 564 | MKDEV(SOUND_MAJOR, dev_list[i].minor), NULL, |
| 565 | NULL, "%s", dev_list[i].name); | 565 | "%s", dev_list[i].name); |
| 566 | 566 | ||
| 567 | if (!dev_list[i].num) | 567 | if (!dev_list[i].num) |
| 568 | continue; | 568 | continue; |
| 569 | 569 | ||
| 570 | for (j = 1; j < *dev_list[i].num; j++) | 570 | for (j = 1; j < *dev_list[i].num; j++) |
| 571 | device_create_drvdata(sound_class, NULL, | 571 | device_create(sound_class, NULL, |
| 572 | MKDEV(SOUND_MAJOR, | 572 | MKDEV(SOUND_MAJOR, |
| 573 | dev_list[i].minor + (j*0x10)), | 573 | dev_list[i].minor + (j*0x10)), |
| 574 | NULL, | 574 | NULL, "%s%d", dev_list[i].name, j); |
| 575 | "%s%d", dev_list[i].name, j); | ||
| 576 | } | 575 | } |
| 577 | 576 | ||
| 578 | if (sound_nblocks >= 1024) | 577 | if (sound_nblocks >= 1024) |