2.6.0-t3.c99.sound-lkml.patch

   1 diff -aur linux.backup/sound/oss/ac97_plugin_ad1980.c linux/sound/oss/ac97_plugin_ad1980.c
   2 --- linux.backup/sound/oss/ac97_plugin_ad1980.c Sat Aug 16 15:02:33 2003
   3 +++ linux/sound/oss/ac97_plugin_ad1980.c        Sun Aug 17 00:23:15 2003
   4 @@ -83,11 +83,11 @@
   5
   6
   7  static struct ac97_driver ad1980_driver = {
   8 -       codec_id: 0x41445370,
   9 -       codec_mask: 0xFFFFFFFF,
  10 -       name: "AD1980 example",
  11 -       probe:  ad1980_probe,
  12 -       remove: __devexit_p(ad1980_remove),
  13 +       .codec_id = 0x41445370,
  14 +       .codec_mask = 0xFFFFFFFF,
  15 +       .name = "AD1980 example",
  16 +       .probe  = ad1980_probe,
  17 +       .remove = __devexit_p(ad1980_remove),
  18  };
  19
  20  /**
  21 diff -aur linux.backup/sound/oss/ad1889.c linux/sound/oss/ad1889.c
  22 --- linux.backup/sound/oss/ad1889.c     Sat Aug 16 15:03:20 2003
  23 +++ linux/sound/oss/ad1889.c    Sat Aug 16 15:45:01 2003
  24 @@ -775,14 +775,14 @@
  25  }
  26
  27  static struct file_operations ad1889_fops = {
  28 -       llseek:         no_llseek,
  29 -       read:           ad1889_read,
  30 -       write:          ad1889_write,
  31 -       poll:           ad1889_poll,
  32 -       ioctl:          ad1889_ioctl,
  33 -       mmap:           ad1889_mmap,
  34 -       open:           ad1889_open,
  35 -       release:        ad1889_release,
  36 +       .llseek         = no_llseek,
  37 +       .read           = ad1889_read,
  38 +       .write          = ad1889_write,
  39 +       .poll           = ad1889_poll,
  40 +       .ioctl          = ad1889_ioctl,
  41 +       .mmap           = ad1889_mmap,
  42 +       .open           = ad1889_open,
  43 +       .release        = ad1889_release,
  44  };
  45
  46  /************************* /dev/mixer interfaces ************************ */
  47 @@ -810,10 +810,10 @@
  48  }
  49
  50  static struct file_operations ad1889_mixer_fops = {
  51 -       llseek:         no_llseek,
  52 -       ioctl:          ad1889_mixer_ioctl,
  53 -       open:           ad1889_mixer_open,
  54 -       release:        ad1889_mixer_release,
  55 +       .llseek         = no_llseek,
  56 +       .ioctl          = ad1889_mixer_ioctl,
  57 +       .open           = ad1889_mixer_open,
  58 +       .release        = ad1889_mixer_release,
  59  };
  60
  61  /************************* AC97 interfaces ****************************** */
  62 @@ -1064,10 +1064,10 @@
  63  MODULE_LICENSE("GPL");
  64
  65  static struct pci_driver ad1889_driver = {
  66 -       name:           DEVNAME,
  67 -       id_table:       ad1889_id_tbl,
  68 -       probe:          ad1889_probe,
  69 -       remove:         __devexit_p(ad1889_remove),
  70 +       .name           = DEVNAME,
  71 +       .id_table       = ad1889_id_tbl,
  72 +       .probe          = ad1889_probe,
  73 +       .remove         = __devexit_p(ad1889_remove),
  74  };
  75
  76  static int __init ad1889_init_module(void)
  77 diff -aur linux.backup/sound/oss/ali5455.c linux/sound/oss/ali5455.c
  78 --- linux.backup/sound/oss/ali5455.c    Sat Aug 16 15:03:20 2003
  79 +++ linux/sound/oss/ali5455.c   Sun Aug 17 00:27:22 2003
  80 @@ -2933,15 +2933,15 @@
  81  }
  82
  83  static /*const */ struct file_operations ali_audio_fops = {
  84 -       owner:THIS_MODULE,
  85 -       llseek:no_llseek,
  86 -       read:ali_read,
  87 -       write:ali_write,
  88 -       poll:ali_poll,
  89 -       ioctl:ali_ioctl,
  90 -       mmap:ali_mmap,
  91 -       open:ali_open,
  92 -       release:ali_release,
  93 +       .owner = THIS_MODULE,
  94 +       .llseek = no_llseek,
  95 +       .read = ali_read,
  96 +       .write = ali_write,
  97 +       .poll = ali_poll,
  98 +       .ioctl = ali_ioctl,
  99 +       .mmap = ali_mmap,
 100 +       .open = ali_open,
 101 +       .release = ali_release,
 102  };
 103
 104  /* Read AC97 codec registers */
 105 @@ -3060,10 +3060,10 @@
 106  }
 107
 108  static /*const */ struct file_operations ali_mixer_fops = {
 109 -       owner:THIS_MODULE,
 110 -       llseek:no_llseek,
 111 -       ioctl:ali_ioctl_mixdev,
 112 -       open:ali_open_mixdev,
 113 +       .owner = THIS_MODULE,
 114 +       .llseek = no_llseek,
 115 +       .ioctl = ali_ioctl_mixdev,
 116 +       .open = ali_open_mixdev,
 117  };
 118
 119  /* AC97 codec initialisation.  These small functions exist so we don't
 120 @@ -3661,10 +3661,13 @@
 121  MODULE_PARM(controller_independent_spdif_locked, "i");
 122  #define ALI5455_MODULE_NAME "ali5455"
 123  static struct pci_driver ali_pci_driver = {
 124 -       name:ALI5455_MODULE_NAME, id_table:ali_pci_tbl, probe:ali_probe,
 125 -           remove:__devexit_p(ali_remove),
 126 +       .name = ALI5455_MODULE_NAME,
 127 +       .id_table = ali_pci_tbl,
 128 +       .probe = ali_probe,
 129 +       .remove = __devexit_p(ali_remove),
 130  #ifdef CONFIG_PM
 131 -       suspend:ali_pm_suspend, resume:ali_pm_resume,
 132 +       .suspend = ali_pm_suspend,
 133 +       .resume = ali_pm_resume,
 134  #endif                         /* CONFIG_PM */
 135  };
 136
 137 diff -aur linux.backup/sound/oss/au1000.c linux/sound/oss/au1000.c
 138 --- linux.backup/sound/oss/au1000.c     Mon Jul 21 23:35:20 2003
 139 +++ linux/sound/oss/au1000.c    Sun Aug 17 00:28:14 2003
 140 @@ -911,11 +911,11 @@
 141  }
 142
 143  static /*const */ struct file_operations au1000_mixer_fops = {
 144 -       owner:THIS_MODULE,
 145 -       llseek:au1000_llseek,
 146 -       ioctl:au1000_ioctl_mixdev,
 147 -       open:au1000_open_mixdev,
 148 -       release:au1000_release_mixdev,
 149 +       .owner = THIS_MODULE,
 150 +       .llseek = au1000_llseek,
 151 +       .ioctl = au1000_ioctl_mixdev,
 152 +       .open = au1000_open_mixdev,
 153 +       .release = au1000_release_mixdev,
 154  };
 155
 156  /* --------------------------------------------------------------------- */
 157 @@ -1940,15 +1940,15 @@
 158  }
 159
 160  static /*const */ struct file_operations au1000_audio_fops = {
 161 -       owner:          THIS_MODULE,
 162 -       llseek:         au1000_llseek,
 163 -       read:           au1000_read,
 164 -       write:          au1000_write,
 165 -       poll:           au1000_poll,
 166 -       ioctl:          au1000_ioctl,
 167 -       mmap:           au1000_mmap,
 168 -       open:           au1000_open,
 169 -       release:        au1000_release,
 170 +       .owner          = THIS_MODULE,
 171 +       .llseek         = au1000_llseek,
 172 +       .read           = au1000_read,
 173 +       .write          = au1000_write,
 174 +       .poll           = au1000_poll,
 175 +       .ioctl          = au1000_ioctl,
 176 +       .mmap           = au1000_mmap,
 177 +       .open           = au1000_open,
 178 +       .release        = au1000_release,
 179  };
 180
 181
 182 diff -aur linux.backup/sound/oss/forte.c linux/sound/oss/forte.c
 183 --- linux.backup/sound/oss/forte.c      Sat Aug 16 15:03:21 2003
 184 +++ linux/sound/oss/forte.c     Sat Aug 16 15:45:02 2003
 185 @@ -361,11 +361,11 @@
 186
 187
 188  static struct file_operations forte_mixer_fops = {
 189 -       owner:                  THIS_MODULE,
 190 -       llseek:                 no_llseek,
 191 -       ioctl:                  forte_mixer_ioctl,
 192 -       open:                   forte_mixer_open,
 193 -       release:                forte_mixer_release,
 194 +       .owner                  = THIS_MODULE,
 195 +       .llseek                 = no_llseek,
 196 +       .ioctl                  = forte_mixer_ioctl,
 197 +       .open                   = forte_mixer_open,
 198 +       .release                = forte_mixer_release,
 199  };
 200
 201
 202 @@ -1632,15 +1632,15 @@
 203
 204
 205  static struct file_operations forte_dsp_fops = {
 206 -       owner:                  THIS_MODULE,
 207 -       llseek:                 &no_llseek,
 208 -       read:                   &forte_dsp_read,
 209 -       write:                  &forte_dsp_write,
 210 -       poll:                   &forte_dsp_poll,
 211 -       ioctl:                  &forte_dsp_ioctl,
 212 -       open:                   &forte_dsp_open,
 213 -       release:                &forte_dsp_release,
 214 -       mmap:                   &forte_dsp_mmap,
 215 +       .owner                  = THIS_MODULE,
 216 +       .llseek                 = &no_llseek,
 217 +       .read                   = &forte_dsp_read,
 218 +       .write                  = &forte_dsp_write,
 219 +       .poll                   = &forte_dsp_poll,
 220 +       .ioctl                  = &forte_dsp_ioctl,
 221 +       .open                   = &forte_dsp_open,
 222 +       .release                = &forte_dsp_release,
 223 +       .mmap                   = &forte_dsp_mmap,
 224  };
 225
 226
 227 @@ -2099,10 +2099,10 @@
 228
 229
 230  static struct pci_driver forte_pci_driver = {
 231 -       name:                   DRIVER_NAME,
 232 -       id_table:               forte_pci_ids,
 233 -       probe:                  forte_probe,
 234 -       remove:                 forte_remove,
 235 +       .name                   = DRIVER_NAME,
 236 +       .id_table               = forte_pci_ids,
 237 +       .probe                  = forte_probe,
 238 +       .remove                 = forte_remove,
 239
 240  };
 241
 242 diff -aur linux.backup/sound/oss/hal2.c linux/sound/oss/hal2.c
 243 --- linux.backup/sound/oss/hal2.c       Sat Aug 16 15:03:21 2003
 244 +++ linux/sound/oss/hal2.c      Sat Aug 16 15:45:02 2003
 245 @@ -1313,22 +1313,22 @@
 246  }
 247
 248  static struct file_operations hal2_audio_fops = {
 249 -       owner:          THIS_MODULE,
 250 -       llseek:         no_llseek,
 251 -       read:           hal2_read,
 252 -       write:          hal2_write,
 253 -       poll:           hal2_poll,
 254 -       ioctl:          hal2_ioctl,
 255 -       open:           hal2_open,
 256 -       release:        hal2_release,
 257 +       .owner          = THIS_MODULE,
 258 +       .llseek         = no_llseek,
 259 +       .read           = hal2_read,
 260 +       .write          = hal2_write,
 261 +       .poll           = hal2_poll,
 262 +       .ioctl          = hal2_ioctl,
 263 +       .open           = hal2_open,
 264 +       .release        = hal2_release,
 265  };
 266
 267  static struct file_operations hal2_mixer_fops = {
 268 -       owner:          THIS_MODULE,
 269 -       llseek:         no_llseek,
 270 -       ioctl:          hal2_ioctl_mixdev,
 271 -       open:           hal2_open_mixdev,
 272 -       release:        hal2_release_mixdev,
 273 +       .owner          = THIS_MODULE,
 274 +       .llseek         = no_llseek,
 275 +       .ioctl          = hal2_ioctl_mixdev,
 276 +       .open           = hal2_open_mixdev,
 277 +       .release        = hal2_release_mixdev,
 278  };
 279
 280  static int hal2_request_irq(hal2_card_t *hal2, int irq)
 281 diff -aur linux.backup/sound/oss/harmony.c linux/sound/oss/harmony.c
 282 --- linux.backup/sound/oss/harmony.c    Sat Aug 16 15:03:21 2003
 283 +++ linux/sound/oss/harmony.c   Mon Aug 18 23:12:57 2003
 284 @@ -822,14 +822,14 @@
 285   */
 286
 287  static struct file_operations harmony_audio_fops = {
 288 -       owner:  THIS_MODULE,
 289 -       llseek: no_llseek,
 290 -       read:   harmony_audio_read,
 291 -       write:  harmony_audio_write,
 292 -       poll:   harmony_audio_poll,
 293 -       ioctl:  harmony_audio_ioctl,
 294 -       open:   harmony_audio_open,
 295 -       release:harmony_audio_release,
 296 +       .owner  = THIS_MODULE,
 297 +       .llseek = no_llseek,
 298 +       .read   = harmony_audio_read,
 299 +       .write  = harmony_audio_write,
 300 +       .poll   = harmony_audio_poll,
 301 +       .ioctl  = harmony_audio_ioctl,
 302 +       .open   = harmony_audio_open,
 303 +       .release = harmony_audio_release,
 304  };
 305
 306  static int harmony_audio_init(void)
 307 @@ -1144,11 +1144,11 @@
 308  }
 309
 310  static struct file_operations harmony_mixer_fops = {
 311 -       owner:          THIS_MODULE,
 312 -       llseek:         no_llseek,
 313 -       open:           harmony_mixer_open,
 314 -       release:        harmony_mixer_release,
 315 -       ioctl:          harmony_mixer_ioctl,
 316 +       .owner          = THIS_MODULE,
 317 +       .llseek         = no_llseek,
 318 +       .open           = harmony_mixer_open,
 319 +       .release        = harmony_mixer_release,
 320 +       .ioctl          = harmony_mixer_ioctl,
 321  };
 322
 323
 324 @@ -1274,9 +1274,9 @@
 325  MODULE_DEVICE_TABLE(parisc, harmony_tbl);
 326
 327  static struct parisc_driver harmony_driver = {
 328 -       name:           "Lasi Harmony",
 329 -       id_table:       harmony_tbl,
 330 -       probe:          harmony_driver_callback,
 331 +       .name           = "Lasi Harmony",
 332 +       .id_table       = harmony_tbl,
 333 +       .probe          = harmony_driver_callback,
 334  };
 335
 336  static int __init init_harmony(void)
 337 diff -aur linux.backup/sound/oss/ite8172.c linux/sound/oss/ite8172.c
 338 --- linux.backup/sound/oss/ite8172.c    Sat Aug 16 15:03:21 2003
 339 +++ linux/sound/oss/ite8172.c   Sun Aug 17 00:29:58 2003
 340 @@ -1003,11 +1003,11 @@
 341  }
 342
 343  static /*const*/ struct file_operations it8172_mixer_fops = {
 344 -       owner:  THIS_MODULE,
 345 -       llseek: it8172_llseek,
 346 -       ioctl:  it8172_ioctl_mixdev,
 347 -       open:   it8172_open_mixdev,
 348 -       release:        it8172_release_mixdev,
 349 +       .owner  = THIS_MODULE,
 350 +       .llseek = it8172_llseek,
 351 +       .ioctl  = it8172_ioctl_mixdev,
 352 +       .open   = it8172_open_mixdev,
 353 +       .release        = it8172_release_mixdev,
 354  };
 355
 356  /* --------------------------------------------------------------------- */
 357 @@ -1872,15 +1872,15 @@
 358  }
 359
 360  static /*const*/ struct file_operations it8172_audio_fops = {
 361 -       owner:  THIS_MODULE,
 362 -       llseek: it8172_llseek,
 363 -       read:   it8172_read,
 364 -       write:  it8172_write,
 365 -       poll:   it8172_poll,
 366 -       ioctl:  it8172_ioctl,
 367 -       mmap:   it8172_mmap,
 368 -       open:   it8172_open,
 369 -       release:        it8172_release,
 370 +       .owner  = THIS_MODULE,
 371 +       .llseek = it8172_llseek,
 372 +       .read   = it8172_read,
 373 +       .write  = it8172_write,
 374 +       .poll   = it8172_poll,
 375 +       .ioctl  = it8172_ioctl,
 376 +       .mmap   = it8172_mmap,
 377 +       .open   = it8172_open,
 378 +       .release        = it8172_release,
 379  };
 380
 381
 382 @@ -2196,10 +2196,10 @@
 383  MODULE_DEVICE_TABLE(pci, id_table);
 384
 385  static struct pci_driver it8172_driver = {
 386 -       name: IT8172_MODULE_NAME,
 387 -       id_table: id_table,
 388 -       probe: it8172_probe,
 389 -       remove: it8172_remove
 390 +       .name = IT8172_MODULE_NAME,
 391 +       .id_table = id_table,
 392 +       .probe = it8172_probe,
 393 +       .remove = it8172_remove
 394  };
 395
 396  static int __init init_it8172(void)
 397 diff -aur linux.backup/sound/oss/kahlua.c linux/sound/oss/kahlua.c
 398 --- linux.backup/sound/oss/kahlua.c     Sat Aug 16 15:03:21 2003
 399 +++ linux/sound/oss/kahlua.c    Sat Aug 16 15:45:02 2003
 400 @@ -203,10 +203,10 @@
 401  MODULE_DEVICE_TABLE(pci, id_tbl);
 402
 403  static struct pci_driver kahlua_driver = {
 404 -       name:           "kahlua",
 405 -       id_table:       id_tbl,
 406 -       probe:          probe_one,
 407 -       remove:         __devexit_p(remove_one),
 408 +       .name           = "kahlua",
 409 +       .id_table       = id_tbl,
 410 +       .probe          = probe_one,
 411 +       .remove         = __devexit_p(remove_one),
 412  };
 413
 414
 415 diff -aur linux.backup/sound/oss/swarm_cs4297a.c linux/sound/oss/swarm_cs4297a.c
 416 --- linux.backup/sound/oss/swarm_cs4297a.c      Sat Aug 16 15:03:21 2003
 417 +++ linux/sound/oss/swarm_cs4297a.c     Sun Aug 17 00:31:14 2003
 418 @@ -1590,10 +1590,10 @@
 419  //   Mixer file operations struct.
 420  // ******************************************************************************************
 421  static /*const */ struct file_operations cs4297a_mixer_fops = {
 422 -       llseek:cs4297a_llseek,
 423 -       ioctl:cs4297a_ioctl_mixdev,
 424 -       open:cs4297a_open_mixdev,
 425 -       release:cs4297a_release_mixdev,
 426 +       .llseek = cs4297a_llseek,
 427 +       .ioctl = cs4297a_ioctl_mixdev,
 428 +       .open = cs4297a_open_mixdev,
 429 +       .release = cs4297a_release_mixdev,
 430  };
 431
 432  // ---------------------------------------------------------------------
 433 @@ -2508,14 +2508,14 @@
 434  //   Wave (audio) file operations struct.
 435  // ******************************************************************************************
 436  static /*const */ struct file_operations cs4297a_audio_fops = {
 437 -       llseek:cs4297a_llseek,
 438 -       read:cs4297a_read,
 439 -       write:cs4297a_write,
 440 -       poll:cs4297a_poll,
 441 -       ioctl:cs4297a_ioctl,
 442 -       mmap:cs4297a_mmap,
 443 -       open:cs4297a_open,
 444 -       release:cs4297a_release,
 445 +       .llseek = cs4297a_llseek,
 446 +       .read = cs4297a_read,
 447 +       .write = cs4297a_write,
 448 +       .poll = cs4297a_poll,
 449 +       .ioctl = cs4297a_ioctl,
 450 +       .mmap = cs4297a_mmap,
 451 +       .open = cs4297a_open,
 452 +       .release = cs4297a_release,
 453  };
 454
 455  static irqreturn_t cs4297a_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 456 diff -aur linux.backup/sound/oss/via82cxxx_audio.c linux/sound/oss/via82cxxx_audio.c
 457 --- linux.backup/sound/oss/via82cxxx_audio.c    Sat Aug 16 15:03:21 2003
 458 +++ linux/sound/oss/via82cxxx_audio.c   Sat Aug 16 15:45:01 2003
 459 @@ -398,10 +398,10 @@
 460
 461
 462  static struct pci_driver via_driver = {
 463 -       name:           VIA_MODULE_NAME,
 464 -       id_table:       via_pci_tbl,
 465 -       probe:          via_init_one,
 466 -       remove:         __devexit_p(via_remove_one),
 467 +       .name           = VIA_MODULE_NAME,
 468 +       .id_table       = via_pci_tbl,
 469 +       .probe          = via_init_one,
 470 +       .remove         = __devexit_p(via_remove_one),
 471  };
 472
 473
 474 @@ -2057,15 +2057,15 @@
 475   */
 476
 477  static struct file_operations via_dsp_fops = {
 478 -       owner:          THIS_MODULE,
 479 -       open:           via_dsp_open,
 480 -       release:        via_dsp_release,
 481 -       read:           via_dsp_read,
 482 -       write:          via_dsp_write,
 483 -       poll:           via_dsp_poll,
 484 -       llseek:         no_llseek,
 485 -       ioctl:          via_dsp_ioctl,
 486 -       mmap:           via_dsp_mmap,
 487 +       .owner          = THIS_MODULE,
 488 +       .open           = via_dsp_open,
 489 +       .release        = via_dsp_release,
 490 +       .read           = via_dsp_read,
 491 +       .write          = via_dsp_write,
 492 +       .poll           = via_dsp_poll,
 493 +       .llseek         = no_llseek,
 494 +       .ioctl          = via_dsp_ioctl,
 495 +       .mmap           = via_dsp_mmap,
 496  };
 497
 498
 499 @@ -2179,10 +2179,10 @@
 500
 501
 502  struct vm_operations_struct via_mm_ops = {
 503 -       nopage:         via_mm_nopage,
 504 +       .nopage         = via_mm_nopage,
 505
 506  #ifndef VM_RESERVED
 507 -       swapout:        via_mm_swapout,
 508 +       .swapout        = via_mm_swapout,
 509  #endif
 510  };
 511
 512 diff -aur linux.backup/sound/parisc/harmony.c linux/sound/parisc/harmony.c
 513 --- linux.backup/sound/parisc/harmony.c Thu Jun 26 23:48:18 2003
 514 +++ linux/sound/parisc/harmony.c        Mon Aug 18 23:13:27 2003
 515 @@ -1107,9 +1107,9 @@
 516   */
 517
 518  static struct parisc_driver snd_card_harmony_driver = {
 519 -       name:           "Lasi ALSA Harmony",
 520 -       id_table:       snd_card_harmony_devicetbl,
 521 -       probe:          snd_card_harmony_probe,
 522 +       .name           = "Lasi ALSA Harmony",
 523 +       .id_table       = snd_card_harmony_devicetbl,
 524 +       .probe          = snd_card_harmony_probe,
 525  };
 526
 527  static int __init alsa_card_harmony_init(void)