linux-next: manual merge of the char-misc tree with the sound-asoc tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the char-misc tree got a conflict in
drivers/misc/atmel-ssc.c between commit 5c86ac695c7e ("ASoC: atmel-ssc:
use module_platform_driver macro") from the sound-asoc tree and commit
2d6bed9ca93e ("drivers/misc: remove use of __devexit_p") from the
char-misc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

diff --cc drivers/misc/atmel-ssc.c
index d07a9ed,c58f9ab..0000000
--- a/drivers/misc/atmel-ssc.c
+++ b/drivers/misc/atmel-ssc.c
@@@ -186,10 -125,19 +186,10 @@@ static int ssc_probe(struct platform_de
        dev_info(&pdev->dev, "Atmel SSC device at 0x%p (irq %d)\n",
                        ssc->regs, ssc->irq);
  
 -      goto out;
 -
 -out_unmap:
 -      iounmap(ssc->regs);
 -out_clk:
 -      clk_put(ssc->clk);
 -out_free:
 -      kfree(ssc);
 -out:
 -      return retval;
 +      return 0;
  }
  
- static int __devexit ssc_remove(struct platform_device *pdev)
+ static int ssc_remove(struct platform_device *pdev)
  {
        struct ssc_device *ssc = platform_get_drvdata(pdev);
  
@@@ -204,13 -155,21 +204,13 @@@ static struct platform_driver ssc_drive
        .driver         = {
                .name           = "ssc",
                .owner          = THIS_MODULE,
 +              .of_match_table = of_match_ptr(atmel_ssc_dt_ids),
        },
 +      .id_table       = atmel_ssc_devtypes,
 +      .probe          = ssc_probe,
-       .remove         = __devexit_p(ssc_remove),
++      .remove         = ssc_remove,
  };
 -
 -static int __init ssc_init(void)
 -{
 -      return platform_driver_probe(&ssc_driver, ssc_probe);
 -}
 -module_init(ssc_init);
 -
 -static void __exit ssc_exit(void)
 -{
 -      platform_driver_unregister(&ssc_driver);
 -}
 -module_exit(ssc_exit);
 +module_platform_driver(ssc_driver);
  
  MODULE_AUTHOR("Hans-Christian Egtvedt <hcegtv...@atmel.com>");
  MODULE_DESCRIPTION("SSC driver for Atmel AVR32 and AT91");

pgp8TJKV2rDwo.pgp
Description: PGP signature