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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20121126194229.feef81574cac8e860cf68df9@canb.auug.org.au>
Date:	Mon, 26 Nov 2012 19:42:29 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Bill Pemberton <wfp5p@...ginia.edu>,
	Bo Shen <voice.shen@...el.com>,
	Mark Brown <broonie@...nsource.wolfsonmicro.com>,
	Liam Girdwood <lrg@...com>
Subject: linux-next: manual merge of the char-misc tree with the sound-asoc
 tree

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                    sfr@...b.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 <hcegtvedt@...el.com>");
  MODULE_DESCRIPTION("SSC driver for Atmel AVR32 and AT91");

Content of type "application/pgp-signature" skipped