* linux-next: manual merge of the driver-core tree with the spi tree
@ 2013-02-06 5:21 Stephen Rothwell
2013-02-06 6:03 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2013-02-06 5:21 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Thierry Reding, Jingoo Han, Grant Likely
[-- Attachment #1: Type: text/plain, Size: 1169 bytes --]
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in drivers/spi/spi-s3c64xx.c between commit 4eb770067f3a ("spi/s3c64xx: Use devm_clk_get() and devm_request_irq()") from the tree and commit b0ee5605234a ("spi: Convert to devm_ioremap_resource()") from the driver-core tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/spi/spi-s3c64xx.c
index 7cfbe9d,3d4a7c4..0000000
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@@ -1241,11 -1276,10 +1241,10 @@@ static int s3c64xx_spi_probe(struct pla
/* the spi->mode bits understood by this driver: */
master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;
- sdd->regs = devm_request_and_ioremap(&pdev->dev, mem_res);
- if (sdd->regs == NULL) {
- dev_err(&pdev->dev, "Unable to remap IO\n");
- ret = -ENXIO;
+ sdd->regs = devm_ioremap_resource(&pdev->dev, mem_res);
+ if (IS_ERR(sdd->regs)) {
+ ret = PTR_ERR(sdd->regs);
- goto err1;
+ goto err0;
}
if (!sci->cfg_gpio && pdev->dev.of_node) {
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the driver-core tree with the spi tree
2013-02-06 5:21 linux-next: manual merge of the driver-core tree with the spi tree Stephen Rothwell
@ 2013-02-06 6:03 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2013-02-06 6:03 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Thierry Reding, Jingoo Han, Grant Likely
On Wed, Feb 06, 2013 at 04:21:51PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in drivers/spi/spi-s3c64xx.c between commit 4eb770067f3a ("spi/s3c64xx: Use devm_clk_get() and devm_request_irq()") from the tree and commit b0ee5605234a ("spi: Convert to devm_ioremap_resource()") from the driver-core tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good to me, thanks.
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-02-06 6:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-02-06 5:21 linux-next: manual merge of the driver-core tree with the spi tree Stephen Rothwell
2013-02-06 6:03 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).