[FE training-materials-updates] Kernel: dev_request_and_ioremap() removed

[Michael Opdenacker]

Repository : git://git.free-electrons.com/training-materials.git

On branch  : master
Link       : http://git.free-electrons.com/training-materials/commit/?id=57cf2ea6884fa3d3d2324eb384346d393f6df10a

>---------------------------------------------------------------

commit 57cf2ea6884fa3d3d2324eb384346d393f6df10a
Author: Michael Opdenacker <michael.opdenacker at free-electrons.com>
Date:   Thu Apr 2 12:19:54 2015 +0200

    Kernel: dev_request_and_ioremap() removed
    
    Signed-off-by: Michael Opdenacker <michael.opdenacker at free-electrons.com>


>---------------------------------------------------------------

57cf2ea6884fa3d3d2324eb384346d393f6df10a
 labs/kernel-serial-iomem/kernel-serial-iomem.tex                        | 2 +-
 .../kernel-driver-development-io-memory.tex                             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/labs/kernel-serial-iomem/kernel-serial-iomem.tex b/labs/kernel-serial-iomem/kernel-serial-iomem.tex
index 94a08cd..15dc261 100644
--- a/labs/kernel-serial-iomem/kernel-serial-iomem.tex
+++ b/labs/kernel-serial-iomem/kernel-serial-iomem.tex
@@ -148,7 +148,7 @@ You can now get a virtual address for your device's base physical
 address, by calling:
 
 \begin{verbatim}
-        dev->regs = devm_request_and_ioremap(&pdev->dev, res);
+        dev->regs = devm_ioremap_resource(&pdev->dev, res);
 
         if (!dev->regs) {
                 dev_err(&pdev->dev, "Cannot remap registers\n");
diff --git a/slides/kernel-driver-development-io-memory/kernel-driver-development-io-memory.tex b/slides/kernel-driver-development-io-memory/kernel-driver-development-io-memory.tex
index 2c5aa42..3432d74 100644
--- a/slides/kernel-driver-development-io-memory/kernel-driver-development-io-memory.tex
+++ b/slides/kernel-driver-development-io-memory/kernel-driver-development-io-memory.tex
@@ -185,7 +185,7 @@ void iounmap(void __iomem *addr);
   \begin{itemize}
   \item \kfunc{devm_ioremap}
   \item \kfunc{devm_iounmap}
-  \item \kfunc{devm_request_and_ioremap}
+  \item \kfunc{devm_ioremap_resource}
         \begin{itemize}
 	\item Takes care of both the request and remapping operations!
 	\end{itemize}