Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 01d25d460a3b28aab537fab9a0038d1b5832ce28

Authored by Takashi Iwai
Committed by Jaroslav Kysela
1 parent 01ef355f0c
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[ALSA] Replace pci_module_init() with pci_register_driver() 

Documentation,ALS4000 driver,ATIIXP driver,ATIIXP-modem driver
AZT3328 driver,BT87x driver,CMIPCI driver,CS4281 driver
ENS1370/1+ driver,ES1938 driver,ES1968 driver,FM801 driver
Intel8x0 driver,Intel8x0-modem driver,Maestro3 driver,RME32 driver
RME96 driver,SonicVibes driver,VIA82xx driver,VIA82xx-modem driver
ALI5451 driver,au88x0 driver,CA0106 driver,CS46xx driver
EMU10K1/EMU10K2 driver,HDA Intel driver,ICE1712 driver,ICE1724 driver
KORG1212 driver,MIXART driver,NM256 driver,RME HDSP driver
RME9652 driver,Trident driver,Digigram VX222 driver,YMFPCI driver
Replace the obsolete pci_module_init() with pci_register_driver().

Signed-off-by: Takashi Iwai <tiwai@suse.de>

Showing 37 changed files with 177 additions and 58 deletions Side-by-side Diff

Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
Diff comments   View file @ 01d25d4
... ... @@ -371,7 +371,7 @@
371 371 <listitem><para>create <function>probe()</function> callback.</para></listitem>
372 372 <listitem><para>create <function>remove()</function> callback.</para></listitem>
373 373 <listitem><para>create pci_driver table which contains the three pointers above.</para></listitem>
374   - <listitem><para>create <function>init()</function> function just calling <function>pci_module_init()</function> to register the pci_driver table defined above.</para></listitem>
  374 + <listitem><para>create <function>init()</function> function just calling <function>pci_register_driver()</function> to register the pci_driver table defined above.</para></listitem>
375 375 <listitem><para>create <function>exit()</function> function to call <function>pci_unregister_driver()</function> function.</para></listitem>
376 376 </itemizedlist>
377 377 </para>
... ... @@ -1198,7 +1198,7 @@
1198 1198 /* initialization of the module */
1199 1199 static int __init alsa_card_mychip_init(void)
1200 1200 {
1201   - return pci_module_init(&driver);
  1201 + return pci_register_driver(&driver);
1202 1202 }
1203 1203  
1204 1204 /* clean up the module */
... ... @@ -1654,7 +1654,7 @@
1654 1654 <![CDATA[
1655 1655 static int __init alsa_card_mychip_init(void)
1656 1656 {
1657   - return pci_module_init(&driver);
  1657 + return pci_register_driver(&driver);
1658 1658 }
1659 1659  
1660 1660 static void __exit alsa_card_mychip_exit(void)
sound/pci/ali5451/ali5451.c
Diff comments   View file @ 01d25d4
... ... @@ -2270,7 +2270,7 @@
2270 2270  
2271 2271 static int __init alsa_card_ali_init(void)
2272 2272 {
2273   - return pci_module_init(&driver);
  2273 + return pci_register_driver(&driver);
2274 2274 }
2275 2275  
2276 2276 static void __exit alsa_card_ali_exit(void)
... ... @@ -777,7 +777,7 @@
777 777  
778 778 static int __init alsa_card_als4000_init(void)
779 779 {
780   - return pci_module_init(&driver);
  780 + return pci_register_driver(&driver);
781 781 }
782 782  
783 783 static void __exit alsa_card_als4000_exit(void)
... ... @@ -1645,7 +1645,7 @@
1645 1645  
1646 1646 static int __init alsa_card_atiixp_init(void)
1647 1647 {
1648   - return pci_module_init(&driver);
  1648 + return pci_register_driver(&driver);
1649 1649 }
1650 1650  
1651 1651 static void __exit alsa_card_atiixp_exit(void)
sound/pci/atiixp_modem.c
Diff comments   View file @ 01d25d4
... ... @@ -1332,7 +1332,7 @@
1332 1332  
1333 1333 static int __init alsa_card_atiixp_init(void)
1334 1334 {
1335   - return pci_module_init(&driver);
  1335 + return pci_register_driver(&driver);
1336 1336 }
1337 1337  
1338 1338 static void __exit alsa_card_atiixp_exit(void)
sound/pci/au88x0/au88x0.c
Diff comments   View file @ 01d25d4
... ... @@ -375,7 +375,7 @@
375 375 // initialization of the module
376 376 static int __init alsa_card_vortex_init(void)
377 377 {
378   - return pci_module_init(&driver);
  378 + return pci_register_driver(&driver);
379 379 }
380 380  
381 381 // clean up the module
... ... @@ -1520,7 +1520,7 @@
1520 1520 {
1521 1521 int err;
1522 1522 snd_azf3328_dbgcallenter();
1523   - err = pci_module_init(&driver);
  1523 + err = pci_register_driver(&driver);
1524 1524 snd_azf3328_dbgcallleave();
1525 1525 return err;
1526 1526 }
... ... @@ -918,7 +918,7 @@
918 918 {
919 919 if (load_all)
920 920 driver.id_table = snd_bt87x_default_ids;
921   - return pci_module_init(&driver);
  921 + return pci_register_driver(&driver);
922 922 }
923 923  
924 924 static void __exit alsa_card_bt87x_exit(void)
sound/pci/ca0106/ca0106_main.c
Diff comments   View file @ 01d25d4
... ... @@ -1268,7 +1268,7 @@
1268 1268 {
1269 1269 int err;
1270 1270  
1271   - if ((err = pci_module_init(&driver)) > 0)
  1271 + if ((err = pci_register_driver(&driver)) > 0)
1272 1272 return err;
1273 1273  
1274 1274 return 0;
... ... @@ -519,40 +519,50 @@
519 519 }
520 520  
521 521 /* bit operations for dword register */
522   -static void snd_cmipci_set_bit(cmipci_t *cm, unsigned int cmd, unsigned int flag)
  522 +static int snd_cmipci_set_bit(cmipci_t *cm, unsigned int cmd, unsigned int flag)
523 523 {
524   - unsigned int val;
525   - val = inl(cm->iobase + cmd);
  524 + unsigned int val, oval;
  525 + val = oval = inl(cm->iobase + cmd);
526 526 val |= flag;
  527 + if (val == oval)
  528 + return 0;
527 529 outl(val, cm->iobase + cmd);
  530 + return 1;
528 531 }
529 532  
530   -static void snd_cmipci_clear_bit(cmipci_t *cm, unsigned int cmd, unsigned int flag)
  533 +static int snd_cmipci_clear_bit(cmipci_t *cm, unsigned int cmd, unsigned int flag)
531 534 {
532   - unsigned int val;
533   - val = inl(cm->iobase + cmd);
  535 + unsigned int val, oval;
  536 + val = oval = inl(cm->iobase + cmd);
534 537 val &= ~flag;
  538 + if (val == oval)
  539 + return 0;
535 540 outl(val, cm->iobase + cmd);
  541 + return 1;
536 542 }
537 543  
538   -#if 0 // not used
539 544 /* bit operations for byte register */
540   -static void snd_cmipci_set_bit_b(cmipci_t *cm, unsigned int cmd, unsigned char flag)
  545 +static int snd_cmipci_set_bit_b(cmipci_t *cm, unsigned int cmd, unsigned char flag)
541 546 {
542   - unsigned char val;
543   - val = inb(cm->iobase + cmd);
  547 + unsigned char val, oval;
  548 + val = oval = inb(cm->iobase + cmd);
544 549 val |= flag;
  550 + if (val == oval)
  551 + return 0;
545 552 outb(val, cm->iobase + cmd);
  553 + return 1;
546 554 }
547 555  
548   -static void snd_cmipci_clear_bit_b(cmipci_t *cm, unsigned int cmd, unsigned char flag)
  556 +static int snd_cmipci_clear_bit_b(cmipci_t *cm, unsigned int cmd, unsigned char flag)
549 557 {
550   - unsigned char val;
551   - val = inb(cm->iobase + cmd);
  558 + unsigned char val, oval;
  559 + val = oval = inb(cm->iobase + cmd);
552 560 val &= ~flag;
  561 + if (val == oval)
  562 + return 0;
553 563 outb(val, cm->iobase + cmd);
  564 + return 1;
554 565 }
555   -#endif
556 566  
557 567  
558 568 /*
... ... @@ -2250,8 +2260,8 @@
2250 2260 DEFINE_SWITCH_ARG(exchange_dac, CM_REG_MISC_CTRL, CM_XCHGDAC, CM_XCHGDAC, 0, 0);
2251 2261 #endif
2252 2262 DEFINE_BIT_SWITCH_ARG(fourch, CM_REG_MISC_CTRL, CM_N4SPK3D, 0, 0);
2253   -DEFINE_BIT_SWITCH_ARG(line_rear, CM_REG_MIXER1, CM_SPK4, 1, 0);
2254   -DEFINE_BIT_SWITCH_ARG(line_bass, CM_REG_LEGACY_CTRL, CM_LINE_AS_BASS, 0, 0);
  2263 +// DEFINE_BIT_SWITCH_ARG(line_rear, CM_REG_MIXER1, CM_SPK4, 1, 0);
  2264 +// DEFINE_BIT_SWITCH_ARG(line_bass, CM_REG_LEGACY_CTRL, CM_LINE_AS_BASS, 0, 0);
2255 2265 // DEFINE_BIT_SWITCH_ARG(joystick, CM_REG_FUNCTRL1, CM_JYSTK_EN, 0, 0); /* now module option */
2256 2266 DEFINE_SWITCH_ARG(modem, CM_REG_MISC_CTRL, CM_FLINKON|CM_FLINKOFF, CM_FLINKON, 0, 0);
2257 2267  
2258 2268  
... ... @@ -2300,10 +2310,114 @@
2300 2310 }
2301 2311  
2302 2312  
  2313 +static int snd_cmipci_line_in_mode_info(snd_kcontrol_t *kcontrol,
  2314 + snd_ctl_elem_info_t *uinfo)
  2315 +{
  2316 + cmipci_t *cm = snd_kcontrol_chip(kcontrol);
  2317 + static char *texts[3] = { "Line-In", "Rear Output", "Bass Output" };
  2318 + uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
  2319 + uinfo->count = 1;
  2320 + uinfo->value.enumerated.items = cm->chip_version >= 39 ? 3 : 2;
  2321 + if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
  2322 + uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;
  2323 + strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
  2324 + return 0;
  2325 +}
  2326 +
  2327 +static inline unsigned int get_line_in_mode(cmipci_t *cm)
  2328 +{
  2329 + unsigned int val;
  2330 + if (cm->chip_version >= 39) {
  2331 + val = snd_cmipci_read(cm, CM_REG_LEGACY_CTRL);
  2332 + if (val & CM_LINE_AS_BASS)
  2333 + return 2;
  2334 + }
  2335 + val = snd_cmipci_read_b(cm, CM_REG_MIXER1);
  2336 + if (val & CM_SPK4)
  2337 + return 1;
  2338 + return 0;
  2339 +}
  2340 +
  2341 +static int snd_cmipci_line_in_mode_get(snd_kcontrol_t *kcontrol,
  2342 + snd_ctl_elem_value_t *ucontrol)
  2343 +{
  2344 + cmipci_t *cm = snd_kcontrol_chip(kcontrol);
  2345 +
  2346 + spin_lock_irq(&cm->reg_lock);
  2347 + ucontrol->value.enumerated.item[0] = get_line_in_mode(cm);
  2348 + spin_unlock_irq(&cm->reg_lock);
  2349 + return 0;
  2350 +}
  2351 +
  2352 +static int snd_cmipci_line_in_mode_put(snd_kcontrol_t *kcontrol,
  2353 + snd_ctl_elem_value_t *ucontrol)
  2354 +{
  2355 + cmipci_t *cm = snd_kcontrol_chip(kcontrol);
  2356 + int change;
  2357 +
  2358 + spin_lock_irq(&cm->reg_lock);
  2359 + if (ucontrol->value.enumerated.item[0] == 2)
  2360 + change = snd_cmipci_set_bit(cm, CM_REG_LEGACY_CTRL, CM_LINE_AS_BASS);
  2361 + else
  2362 + change = snd_cmipci_clear_bit(cm, CM_REG_LEGACY_CTRL, CM_LINE_AS_BASS);
  2363 + if (ucontrol->value.enumerated.item[0] == 1)
  2364 + change |= snd_cmipci_set_bit_b(cm, CM_REG_MIXER1, CM_SPK4);
  2365 + else
  2366 + change |= snd_cmipci_clear_bit_b(cm, CM_REG_MIXER1, CM_SPK4);
  2367 + spin_unlock_irq(&cm->reg_lock);
  2368 + return change;
  2369 +}
  2370 +
  2371 +static int snd_cmipci_mic_in_mode_info(snd_kcontrol_t *kcontrol,
  2372 + snd_ctl_elem_info_t *uinfo)
  2373 +{
  2374 + static char *texts[2] = { "Mic-In", "Center/LFE Output" };
  2375 + uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
  2376 + uinfo->count = 1;
  2377 + uinfo->value.enumerated.items = 2;
  2378 + if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
  2379 + uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;
  2380 + strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
  2381 + return 0;
  2382 +}
  2383 +
  2384 +static int snd_cmipci_mic_in_mode_get(snd_kcontrol_t *kcontrol,
  2385 + snd_ctl_elem_value_t *ucontrol)
  2386 +{
  2387 + cmipci_t *cm = snd_kcontrol_chip(kcontrol);
  2388 + /* same bit as spdi_phase */
  2389 + spin_lock_irq(&cm->reg_lock);
  2390 + ucontrol->value.enumerated.item[0] =
  2391 + (snd_cmipci_read_b(cm, CM_REG_MISC) & CM_SPDIF_INVERSE) ? 1 : 0;
  2392 + spin_unlock_irq(&cm->reg_lock);
  2393 + return 0;
  2394 +}
  2395 +
  2396 +static int snd_cmipci_mic_in_mode_put(snd_kcontrol_t *kcontrol,
  2397 + snd_ctl_elem_value_t *ucontrol)
  2398 +{
  2399 + cmipci_t *cm = snd_kcontrol_chip(kcontrol);
  2400 + int change;
  2401 +
  2402 + spin_lock_irq(&cm->reg_lock);
  2403 + if (ucontrol->value.enumerated.item[0])
  2404 + change = snd_cmipci_set_bit_b(cm, CM_REG_MISC, CM_SPDIF_INVERSE);
  2405 + else
  2406 + change = snd_cmipci_clear_bit_b(cm, CM_REG_MISC, CM_SPDIF_INVERSE);
  2407 + spin_unlock_irq(&cm->reg_lock);
  2408 + return change;
  2409 +}
  2410 +
2303 2411 /* both for CM8338/8738 */
2304 2412 static snd_kcontrol_new_t snd_cmipci_mixer_switches[] __devinitdata = {
2305 2413 DEFINE_MIXER_SWITCH("Four Channel Mode", fourch),
2306   - DEFINE_MIXER_SWITCH("Line-In As Rear", line_rear),
  2414 + {
  2415 + .name = "Line-In Mode",
  2416 + .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
  2417 + .info = snd_cmipci_line_in_mode_info,
  2418 + .get = snd_cmipci_line_in_mode_get,
  2419 + .put = snd_cmipci_line_in_mode_put,
  2420 + },
2307 2421 };
2308 2422  
2309 2423 /* for non-multichannel chips */
2310 2424  
... ... @@ -2341,10 +2455,15 @@
2341 2455  
2342 2456 /* only for model 039 or later */
2343 2457 static snd_kcontrol_new_t snd_cmipci_extra_mixer_switches[] __devinitdata = {
2344   - DEFINE_MIXER_SWITCH("Line-In As Bass", line_bass),
2345 2458 DEFINE_MIXER_SWITCH("IEC958 In Select", spdif_in_sel2),
2346 2459 DEFINE_MIXER_SWITCH("IEC958 In Phase Inverse", spdi_phase2),
2347   - DEFINE_MIXER_SWITCH("Mic As Center/LFE", spdi_phase), /* same bit as spdi_phase */
  2460 + {
  2461 + .name = "Mic-In Mode",
  2462 + .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
  2463 + .info = snd_cmipci_mic_in_mode_info,
  2464 + .get = snd_cmipci_mic_in_mode_get,
  2465 + .put = snd_cmipci_mic_in_mode_put,
  2466 + }
2348 2467 };
2349 2468  
2350 2469 /* card control switches */
... ... @@ -2944,7 +3063,7 @@
2944 3063  
2945 3064 static int __init alsa_card_cmipci_init(void)
2946 3065 {
2947   - return pci_module_init(&driver);
  3066 + return pci_register_driver(&driver);
2948 3067 }
2949 3068  
2950 3069 static void __exit alsa_card_cmipci_exit(void)
... ... @@ -2124,7 +2124,7 @@
2124 2124  
2125 2125 static int __init alsa_card_cs4281_init(void)
2126 2126 {
2127   - return pci_module_init(&driver);
  2127 + return pci_register_driver(&driver);
2128 2128 }
2129 2129  
2130 2130 static void __exit alsa_card_cs4281_exit(void)
sound/pci/cs46xx/cs46xx.c
Diff comments   View file @ 01d25d4
... ... @@ -171,7 +171,7 @@
171 171  
172 172 static int __init alsa_card_cs46xx_init(void)
173 173 {
174   - return pci_module_init(&driver);
  174 + return pci_register_driver(&driver);
175 175 }
176 176  
177 177 static void __exit alsa_card_cs46xx_exit(void)
sound/pci/emu10k1/emu10k1.c
Diff comments   View file @ 01d25d4
... ... @@ -228,7 +228,7 @@
228 228  
229 229 static int __init alsa_card_emu10k1_init(void)
230 230 {
231   - return pci_module_init(&driver);
  231 + return pci_register_driver(&driver);
232 232 }
233 233  
234 234 static void __exit alsa_card_emu10k1_exit(void)
sound/pci/emu10k1/emu10k1x.c
Diff comments   View file @ 01d25d4
... ... @@ -1627,7 +1627,7 @@
1627 1627 {
1628 1628 int err;
1629 1629  
1630   - if ((err = pci_module_init(&driver)) > 0)
  1630 + if ((err = pci_register_driver(&driver)) > 0)
1631 1631 return err;
1632 1632  
1633 1633 return 0;
... ... @@ -2401,7 +2401,7 @@
2401 2401  
2402 2402 static int __init alsa_card_ens137x_init(void)
2403 2403 {
2404   - return pci_module_init(&driver);
  2404 + return pci_register_driver(&driver);
2405 2405 }
2406 2406  
2407 2407 static void __exit alsa_card_ens137x_exit(void)
... ... @@ -1761,7 +1761,7 @@
1761 1761  
1762 1762 static int __init alsa_card_es1938_init(void)
1763 1763 {
1764   - return pci_module_init(&driver);
  1764 + return pci_register_driver(&driver);
1765 1765 }
1766 1766  
1767 1767 static void __exit alsa_card_es1938_exit(void)
... ... @@ -2795,7 +2795,7 @@
2795 2795  
2796 2796 static int __init alsa_card_es1968_init(void)
2797 2797 {
2798   - return pci_module_init(&driver);
  2798 + return pci_register_driver(&driver);
2799 2799 }
2800 2800  
2801 2801 static void __exit alsa_card_es1968_exit(void)
... ... @@ -1469,7 +1469,7 @@
1469 1469  
1470 1470 static int __init alsa_card_fm801_init(void)
1471 1471 {
1472   - return pci_module_init(&driver);
  1472 + return pci_register_driver(&driver);
1473 1473 }
1474 1474  
1475 1475 static void __exit alsa_card_fm801_exit(void)
sound/pci/hda/hda_intel.c
Diff comments   View file @ 01d25d4
... ... @@ -1439,7 +1439,7 @@
1439 1439  
1440 1440 static int __init alsa_card_azx_init(void)
1441 1441 {
1442   - return pci_module_init(&driver);
  1442 + return pci_register_driver(&driver);
1443 1443 }
1444 1444  
1445 1445 static void __exit alsa_card_azx_exit(void)
sound/pci/ice1712/ice1712.c
Diff comments   View file @ 01d25d4
... ... @@ -2748,7 +2748,7 @@
2748 2748  
2749 2749 static int __init alsa_card_ice1712_init(void)
2750 2750 {
2751   - return pci_module_init(&driver);
  2751 + return pci_register_driver(&driver);
2752 2752 }
2753 2753  
2754 2754 static void __exit alsa_card_ice1712_exit(void)
sound/pci/ice1712/ice1724.c
Diff comments   View file @ 01d25d4
... ... @@ -2328,7 +2328,7 @@
2328 2328  
2329 2329 static int __init alsa_card_ice1724_init(void)
2330 2330 {
2331   - return pci_module_init(&driver);
  2331 + return pci_register_driver(&driver);
2332 2332 }
2333 2333  
2334 2334 static void __exit alsa_card_ice1724_exit(void)
sound/pci/intel8x0.c
Diff comments   View file @ 01d25d4
... ... @@ -2849,7 +2849,7 @@
2849 2849  
2850 2850 static int __init alsa_card_intel8x0_init(void)
2851 2851 {
2852   - return pci_module_init(&driver);
  2852 + return pci_register_driver(&driver);
2853 2853 }
2854 2854  
2855 2855 static void __exit alsa_card_intel8x0_exit(void)
sound/pci/intel8x0m.c
Diff comments   View file @ 01d25d4
... ... @@ -1452,7 +1452,7 @@
1452 1452  
1453 1453 static int __init alsa_card_intel8x0m_init(void)
1454 1454 {
1455   - return pci_module_init(&driver);
  1455 + return pci_register_driver(&driver);
1456 1456 }
1457 1457  
1458 1458 static void __exit alsa_card_intel8x0m_exit(void)
sound/pci/korg1212/korg1212.c
Diff comments   View file @ 01d25d4
... ... @@ -2541,7 +2541,7 @@
2541 2541  
2542 2542 static int __init alsa_card_korg1212_init(void)
2543 2543 {
2544   - return pci_module_init(&driver);
  2544 + return pci_register_driver(&driver);
2545 2545 }
2546 2546  
2547 2547 static void __exit alsa_card_korg1212_exit(void)
sound/pci/maestro3.c
Diff comments   View file @ 01d25d4
... ... @@ -2702,7 +2702,7 @@
2702 2702  
2703 2703 static int __init alsa_card_m3_init(void)
2704 2704 {
2705   - return pci_module_init(&driver);
  2705 + return pci_register_driver(&driver);
2706 2706 }
2707 2707  
2708 2708 static void __exit alsa_card_m3_exit(void)
sound/pci/mixart/mixart.c
Diff comments   View file @ 01d25d4
... ... @@ -1431,7 +1431,7 @@
1431 1431  
1432 1432 static int __init alsa_card_mixart_init(void)
1433 1433 {
1434   - return pci_module_init(&driver);
  1434 + return pci_register_driver(&driver);
1435 1435 }
1436 1436  
1437 1437 static void __exit alsa_card_mixart_exit(void)
sound/pci/nm256/nm256.c
Diff comments   View file @ 01d25d4
... ... @@ -1645,7 +1645,7 @@
1645 1645  
1646 1646 static int __init alsa_card_nm256_init(void)
1647 1647 {
1648   - return pci_module_init(&driver);
  1648 + return pci_register_driver(&driver);
1649 1649 }
1650 1650  
1651 1651 static void __exit alsa_card_nm256_exit(void)
... ... @@ -2031,7 +2031,7 @@
2031 2031  
2032 2032 static int __init alsa_card_rme32_init(void)
2033 2033 {
2034   - return pci_module_init(&driver);
  2034 + return pci_register_driver(&driver);
2035 2035 }
2036 2036  
2037 2037 static void __exit alsa_card_rme32_exit(void)
... ... @@ -2437,7 +2437,7 @@
2437 2437  
2438 2438 static int __init alsa_card_rme96_init(void)
2439 2439 {
2440   - return pci_module_init(&driver);
  2440 + return pci_register_driver(&driver);
2441 2441 }
2442 2442  
2443 2443 static void __exit alsa_card_rme96_exit(void)
sound/pci/rme9652/hdsp.c
Diff comments   View file @ 01d25d4
... ... @@ -5194,7 +5194,7 @@
5194 5194  
5195 5195 static int __init alsa_card_hdsp_init(void)
5196 5196 {
5197   - return pci_module_init(&driver);
  5197 + return pci_register_driver(&driver);
5198 5198 }
5199 5199  
5200 5200 static void __exit alsa_card_hdsp_exit(void)
sound/pci/rme9652/rme9652.c
Diff comments   View file @ 01d25d4
... ... @@ -2664,7 +2664,7 @@
2664 2664  
2665 2665 static int __init alsa_card_hammerfall_init(void)
2666 2666 {
2667   - return pci_module_init(&driver);
  2667 + return pci_register_driver(&driver);
2668 2668 }
2669 2669  
2670 2670 static void __exit alsa_card_hammerfall_exit(void)
sound/pci/sonicvibes.c
Diff comments   View file @ 01d25d4
... ... @@ -1522,7 +1522,7 @@
1522 1522  
1523 1523 static int __init alsa_card_sonicvibes_init(void)
1524 1524 {
1525   - return pci_module_init(&driver);
  1525 + return pci_register_driver(&driver);
1526 1526 }
1527 1527  
1528 1528 static void __exit alsa_card_sonicvibes_exit(void)
sound/pci/trident/trident.c
Diff comments   View file @ 01d25d4
... ... @@ -184,7 +184,7 @@
184 184  
185 185 static int __init alsa_card_trident_init(void)
186 186 {
187   - return pci_module_init(&driver);
  187 + return pci_register_driver(&driver);
188 188 }
189 189  
190 190 static void __exit alsa_card_trident_exit(void)
... ... @@ -2349,7 +2349,7 @@
2349 2349  
2350 2350 static int __init alsa_card_via82xx_init(void)
2351 2351 {
2352   - return pci_module_init(&driver);
  2352 + return pci_register_driver(&driver);
2353 2353 }
2354 2354  
2355 2355 static void __exit alsa_card_via82xx_exit(void)
sound/pci/via82xx_modem.c
Diff comments   View file @ 01d25d4
... ... @@ -1233,7 +1233,7 @@
1233 1233  
1234 1234 static int __init alsa_card_via82xx_init(void)
1235 1235 {
1236   - return pci_module_init(&driver);
  1236 + return pci_register_driver(&driver);
1237 1237 }
1238 1238  
1239 1239 static void __exit alsa_card_via82xx_exit(void)
sound/pci/vx222/vx222.c
Diff comments   View file @ 01d25d4
... ... @@ -260,7 +260,7 @@
260 260  
261 261 static int __init alsa_card_vx222_init(void)
262 262 {
263   - return pci_module_init(&driver);
  263 + return pci_register_driver(&driver);
264 264 }
265 265  
266 266 static void __exit alsa_card_vx222_exit(void)
sound/pci/ymfpci/ymfpci.c
Diff comments   View file @ 01d25d4
... ... @@ -360,7 +360,7 @@
360 360  
361 361 static int __init alsa_card_ymfpci_init(void)
362 362 {
363   - return pci_module_init(&driver);
  363 + return pci_register_driver(&driver);
364 364 }
365 365  
366 366 static void __exit alsa_card_ymfpci_exit(void)