Merge branch 'topic/section-fix' into for-linus

* topic/section-fix:
  ALSA: Add missing __devexit_p() markers
  ALSA: powermac - Replace the rest of __init*
  ALSA: sound/ppc: update annotations of serveral functions

diff --combined sound/parisc/harmony.c
index 63ae0f9aeaf5d07274e4238bfedb79b12cb243f7,610c43914cf2c69f9740f9cf11e953aca2c6b0a7..e924492df21dc1b469f7b41020ca890737fa9857
--- 1/sound/parisc/harmony.c
--- 2/sound/parisc/harmony.c
+++ b/sound/parisc/harmony.c
@@@ -935,7 -935,7 +935,7 @@@ snd_harmony_create(struct snd_card *car
        h->iobase = ioremap_nocache(padev->hpa.start, HARMONY_SIZE);
        if (h->iobase == NULL) {
                printk(KERN_ERR PFX "unable to remap hpa 0x%lx\n",
 -                     padev->hpa.start);
 +                     (unsigned long)padev->hpa.start);
                err = -EBUSY;
                goto free_and_ret;
        }
@@@ -1020,7 -1020,7 +1020,7 @@@ static struct parisc_driver snd_harmony
        .name = "harmony",
        .id_table = snd_harmony_devtable,
        .probe = snd_harmony_probe,
-       .remove = snd_harmony_remove,
+       .remove = __devexit_p(snd_harmony_remove),
  };
  
  static int __init 

diff --combined sound/ppc/burgundy.c
index d2c0a4e987ae5fa2fa1607acc678977f07292646,bb80770890c702d33c5137c689d5d372d0518e09..16ed240e423cfc5ebdb3da1272915e24f0a9c509
--- 1/sound/ppc/burgundy.c
--- 2/sound/ppc/burgundy.c
+++ b/sound/ppc/burgundy.c
@@@ -46,12 -46,12 +46,12 @@@ snd_pmac_burgundy_extend_wait(struct sn
        timeout = 50;
        while (!(in_le32(&chip->awacs->codec_stat) & MASK_EXTEND) && timeout--)
                udelay(1);
 -      if (! timeout)
 +      if (timeout < 0)
                printk(KERN_DEBUG "burgundy_extend_wait: timeout #1\n");
        timeout = 50;
        while ((in_le32(&chip->awacs->codec_stat) & MASK_EXTEND) && timeout--)
                udelay(1);
 -      if (! timeout)
 +      if (timeout < 0)
                printk(KERN_DEBUG "burgundy_extend_wait: timeout #2\n");
  }
  
@@@ -468,7 -468,7 +468,7 @@@ static int snd_pmac_burgundy_put_switch
  /*
   * Burgundy mixers
   */
- static struct snd_kcontrol_new snd_pmac_burgundy_mixers[] __initdata = {
+ static struct snd_kcontrol_new snd_pmac_burgundy_mixers[] __devinitdata = {
        BURGUNDY_VOLUME_W("Master Playback Volume", 0,
                        MASK_ADDR_BURGUNDY_MASTER_VOLUME, 8),
        BURGUNDY_VOLUME_W("CD Capture Volume", 0,
@@@ -496,7 -496,7 +496,7 @@@
   */   BURGUNDY_SWITCH_B("PCM Capture Switch", 0,
                        MASK_ADDR_BURGUNDY_HOSTIFEH, 0x01, 0, 0)
  };
- static struct snd_kcontrol_new snd_pmac_burgundy_mixers_imac[] __initdata = {
+ static struct snd_kcontrol_new snd_pmac_burgundy_mixers_imac[] __devinitdata = {
        BURGUNDY_VOLUME_W("Line in Capture Volume", 0,
                        MASK_ADDR_BURGUNDY_VOLLINE, 16),
        BURGUNDY_VOLUME_W("Mic Capture Volume", 0,
@@@ -522,7 -522,7 +522,7 @@@
        BURGUNDY_SWITCH_B("Mic Boost Capture Switch", 0,
                        MASK_ADDR_BURGUNDY_INPBOOST, 0x40, 0x80, 1)
  };
- static struct snd_kcontrol_new snd_pmac_burgundy_mixers_pmac[] __initdata = {
+ static struct snd_kcontrol_new snd_pmac_burgundy_mixers_pmac[] __devinitdata = {
        BURGUNDY_VOLUME_W("Line in Capture Volume", 0,
                        MASK_ADDR_BURGUNDY_VOLMIC, 16),
        BURGUNDY_VOLUME_B("Line in Gain Capture Volume", 0,
@@@ -538,33 -538,33 +538,33 @@@
  /*    BURGUNDY_SWITCH_B("Line in Boost Capture Switch", 0,
   *            MASK_ADDR_BURGUNDY_INPBOOST, 0x40, 0x80, 1) */
  };
- static struct snd_kcontrol_new snd_pmac_burgundy_master_sw_imac __initdata =
+ static struct snd_kcontrol_new snd_pmac_burgundy_master_sw_imac __devinitdata =
  BURGUNDY_SWITCH_B("Master Playback Switch", 0,
        MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,
        BURGUNDY_OUTPUT_LEFT | BURGUNDY_LINEOUT_LEFT | BURGUNDY_HP_LEFT,
        BURGUNDY_OUTPUT_RIGHT | BURGUNDY_LINEOUT_RIGHT | BURGUNDY_HP_RIGHT, 1);
- static struct snd_kcontrol_new snd_pmac_burgundy_master_sw_pmac __initdata =
+ static struct snd_kcontrol_new snd_pmac_burgundy_master_sw_pmac __devinitdata =
  BURGUNDY_SWITCH_B("Master Playback Switch", 0,
        MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,
        BURGUNDY_OUTPUT_INTERN
        | BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1);
- static struct snd_kcontrol_new snd_pmac_burgundy_speaker_sw_imac __initdata =
+ static struct snd_kcontrol_new snd_pmac_burgundy_speaker_sw_imac __devinitdata =
  BURGUNDY_SWITCH_B("PC Speaker Playback Switch", 0,
        MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,
        BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1);
- static struct snd_kcontrol_new snd_pmac_burgundy_speaker_sw_pmac __initdata =
+ static struct snd_kcontrol_new snd_pmac_burgundy_speaker_sw_pmac __devinitdata =
  BURGUNDY_SWITCH_B("PC Speaker Playback Switch", 0,
        MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,
        BURGUNDY_OUTPUT_INTERN, 0, 0);
- static struct snd_kcontrol_new snd_pmac_burgundy_line_sw_imac __initdata =
+ static struct snd_kcontrol_new snd_pmac_burgundy_line_sw_imac __devinitdata =
  BURGUNDY_SWITCH_B("Line out Playback Switch", 0,
        MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,
        BURGUNDY_LINEOUT_LEFT, BURGUNDY_LINEOUT_RIGHT, 1);
- static struct snd_kcontrol_new snd_pmac_burgundy_line_sw_pmac __initdata =
+ static struct snd_kcontrol_new snd_pmac_burgundy_line_sw_pmac __devinitdata =
  BURGUNDY_SWITCH_B("Line out Playback Switch", 0,
        MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,
        BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1);
- static struct snd_kcontrol_new snd_pmac_burgundy_hp_sw_imac __initdata =
+ static struct snd_kcontrol_new snd_pmac_burgundy_hp_sw_imac __devinitdata =
  BURGUNDY_SWITCH_B("Headphone Playback Switch", 0,
        MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,
        BURGUNDY_HP_LEFT, BURGUNDY_HP_RIGHT, 1);
@@@ -618,7 -618,7 +618,7 @@@ static void snd_pmac_burgundy_update_au
  /*
   * initialize burgundy
   */
- int __init snd_pmac_burgundy_init(struct snd_pmac *chip)
+ int __devinit snd_pmac_burgundy_init(struct snd_pmac *chip)
  {
        int imac = machine_is_compatible("iMac");
        int i, err;

diff --combined sound/ppc/keywest.c
index b2e2aac2211443e4270278fc32c3db0ccaf54b5b,15518e602003d9b3a0ba0f8db1197cdd6a5d866c..835fa19ed461864018fb152aa3c41eb57261cb4b
--- 1/sound/ppc/keywest.c
--- 2/sound/ppc/keywest.c
+++ b/sound/ppc/keywest.c
@@@ -33,6 -33,10 +33,6 @@@
  static struct pmac_keywest *keywest_ctx;
  
  
 -#ifndef i2c_device_name
 -#define i2c_device_name(x)    ((x)->name)
 -#endif
 -
  static int keywest_probe(struct i2c_client *client,
                         const struct i2c_device_id *id)
  {
@@@ -52,7 -56,7 +52,7 @@@ static int keywest_attach_adapter(struc
        if (! keywest_ctx)
                return -EINVAL;
  
 -      if (strncmp(i2c_device_name(adapter), "mac-io", 6))
 +      if (strncmp(adapter->name, "mac-io", 6))
                return 0; /* ignored */
  
        memset(&info, 0, sizeof(struct i2c_board_info));
@@@ -105,7 -109,7 +105,7 @@@ void snd_pmac_keywest_cleanup(struct pm
        }
  }
  
- int __init snd_pmac_tumbler_post_init(void)
+ int __devinit snd_pmac_tumbler_post_init(void)
  {
        int err;
        
@@@ -120,7 -124,7 +120,7 @@@
  }
  
  /* exported */
- int __init snd_pmac_keywest_init(struct pmac_keywest *i2c)
+ int __devinit snd_pmac_keywest_init(struct pmac_keywest *i2c)
  {
        int err;