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 s...@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) {
pgp4GIU_OCwxQ.pgp
Description: PGP signature
