[PATCH] docs: fix pointers to io-mapping.rst and io_ordering.rst files

[PATCH] docs: fix pointers to io-mapping.rst and io_ordering.rst files

[Mauro Carvalho Chehab]

Those files got moved, but cross-references still point to the
wrong places.

Fixes: fcd680727157 ("Documentation: Add io-mapping.rst to driver-api manual")
Fixes: d1ce350015d8 ("Documentation: Add io_ordering.rst to driver-api manual")
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---
 Documentation/PCI/pci.rst                        | 2 +-
 Documentation/translations/zh_CN/io_ordering.txt | 4 ++--
 arch/unicore32/include/asm/io.h                  | 2 +-
 include/linux/io-mapping.h                       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Documentation/PCI/pci.rst b/Documentation/PCI/pci.rst
index 6864f9a70f5f..8c016d8c9862 100644
--- a/Documentation/PCI/pci.rst
+++ b/Documentation/PCI/pci.rst
@@ -239,7 +239,7 @@ from the PCI device config space. Use the values in the pci_dev structure
 as the PCI "bus address" might have been remapped to a "host physical"
 address by the arch/chip-set specific kernel support.
 
-See Documentation/io-mapping.txt for how to access device registers
+See Documentation/driver-api/io-mapping.rst for how to access device registers
 or device memory.
 
 The device driver needs to call pci_request_region() to verify
diff --git a/Documentation/translations/zh_CN/io_ordering.txt b/Documentation/translations/zh_CN/io_ordering.txt
index 1f8127bdd415..7bb3086227ae 100644
--- a/Documentation/translations/zh_CN/io_ordering.txt
+++ b/Documentation/translations/zh_CN/io_ordering.txt
@@ -1,4 +1,4 @@
-Chinese translated version of Documentation/io_ordering.txt
+Chinese translated version of Documentation/driver-api/io_ordering.rst
 
 If you have any comment or update to the content, please contact the
 original document maintainer directly.  However, if you have a problem
@@ -8,7 +8,7 @@ or if there is a problem with the translation.
 
 Chinese maintainer: Lin Yongting <linyongting@gmail.com>
 ---------------------------------------------------------------------
-Documentation/io_ordering.txt 的中文翻译
+Documentation/driver-api/io_ordering.rst 的中文翻译
 
 如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文
 交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻
diff --git a/arch/unicore32/include/asm/io.h b/arch/unicore32/include/asm/io.h
index 3ca74e1cde7d..bd4e7c332f85 100644
--- a/arch/unicore32/include/asm/io.h
+++ b/arch/unicore32/include/asm/io.h
@@ -27,7 +27,7 @@ extern void __uc32_iounmap(volatile void __iomem *addr);
  * ioremap and friends.
  *
  * ioremap takes a PCI memory address, as specified in
- * Documentation/io-mapping.txt.
+ * Documentation/driver-api/io-mapping.rst.
  *
  */
 #define ioremap(cookie, size)		__uc32_ioremap(cookie, size)
diff --git a/include/linux/io-mapping.h b/include/linux/io-mapping.h
index 837058bc1c9f..b336622612f3 100644
--- a/include/linux/io-mapping.h
+++ b/include/linux/io-mapping.h
@@ -16,7 +16,7 @@
  * The io_mapping mechanism provides an abstraction for mapping
  * individual pages from an io device to the CPU in an efficient fashion.
  *
- * See Documentation/io-mapping.txt
+ * See Documentation/driver-api/io-mapping.rst
  */
 
 struct io_mapping {
-- 
2.24.1

Re: [PATCH] docs: fix pointers to io-mapping.rst and io_ordering.rst files

[Alex Shi]

Reviewed-by: Alex Shi <alex.shi@linux.alibaba.com>

在 2020/3/11 下午7:51, Mauro Carvalho Chehab 写道:
> Those files got moved, but cross-references still point to the
> wrong places.
> 
> Fixes: fcd680727157 ("Documentation: Add io-mapping.rst to driver-api manual")
> Fixes: d1ce350015d8 ("Documentation: Add io_ordering.rst to driver-api manual")
> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
> ---
>  Documentation/PCI/pci.rst                        | 2 +-
>  Documentation/translations/zh_CN/io_ordering.txt | 4 ++--
>  arch/unicore32/include/asm/io.h                  | 2 +-
>  include/linux/io-mapping.h                       | 2 +-
>  4 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/Documentation/PCI/pci.rst b/Documentation/PCI/pci.rst
> index 6864f9a70f5f..8c016d8c9862 100644
> --- a/Documentation/PCI/pci.rst
> +++ b/Documentation/PCI/pci.rst
> @@ -239,7 +239,7 @@ from the PCI device config space. Use the values in the pci_dev structure
>  as the PCI "bus address" might have been remapped to a "host physical"
>  address by the arch/chip-set specific kernel support.
>  
> -See Documentation/io-mapping.txt for how to access device registers
> +See Documentation/driver-api/io-mapping.rst for how to access device registers
>  or device memory.
>  
>  The device driver needs to call pci_request_region() to verify
> diff --git a/Documentation/translations/zh_CN/io_ordering.txt b/Documentation/translations/zh_CN/io_ordering.txt
> index 1f8127bdd415..7bb3086227ae 100644
> --- a/Documentation/translations/zh_CN/io_ordering.txt
> +++ b/Documentation/translations/zh_CN/io_ordering.txt
> @@ -1,4 +1,4 @@
> -Chinese translated version of Documentation/io_ordering.txt
> +Chinese translated version of Documentation/driver-api/io_ordering.rst
>  
>  If you have any comment or update to the content, please contact the
>  original document maintainer directly.  However, if you have a problem
> @@ -8,7 +8,7 @@ or if there is a problem with the translation.
>  
>  Chinese maintainer: Lin Yongting <linyongting@gmail.com>
>  ---------------------------------------------------------------------
> -Documentation/io_ordering.txt 的中文翻译
> +Documentation/driver-api/io_ordering.rst 的中文翻译
>  
>  如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文
>  交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻
> diff --git a/arch/unicore32/include/asm/io.h b/arch/unicore32/include/asm/io.h
> index 3ca74e1cde7d..bd4e7c332f85 100644
> --- a/arch/unicore32/include/asm/io.h
> +++ b/arch/unicore32/include/asm/io.h
> @@ -27,7 +27,7 @@ extern void __uc32_iounmap(volatile void __iomem *addr);
>   * ioremap and friends.
>   *
>   * ioremap takes a PCI memory address, as specified in
> - * Documentation/io-mapping.txt.
> + * Documentation/driver-api/io-mapping.rst.
>   *
>   */
>  #define ioremap(cookie, size)		__uc32_ioremap(cookie, size)
> diff --git a/include/linux/io-mapping.h b/include/linux/io-mapping.h
> index 837058bc1c9f..b336622612f3 100644
> --- a/include/linux/io-mapping.h
> +++ b/include/linux/io-mapping.h
> @@ -16,7 +16,7 @@
>   * The io_mapping mechanism provides an abstraction for mapping
>   * individual pages from an io device to the CPU in an efficient fashion.
>   *
> - * See Documentation/io-mapping.txt
> + * See Documentation/driver-api/io-mapping.rst
>   */
>  
>  struct io_mapping {
> 

Re: [PATCH] docs: fix pointers to io-mapping.rst and io_ordering.rst files

[Andy Shevchenko]

On Wed, Mar 11, 2020 at 12:51:17PM +0100, Mauro Carvalho Chehab wrote:
> Those files got moved, but cross-references still point to the
> wrong places.

FWIW,
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

> Fixes: fcd680727157 ("Documentation: Add io-mapping.rst to driver-api manual")
> Fixes: d1ce350015d8 ("Documentation: Add io_ordering.rst to driver-api manual")
> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
> ---
>  Documentation/PCI/pci.rst                        | 2 +-
>  Documentation/translations/zh_CN/io_ordering.txt | 4 ++--
>  arch/unicore32/include/asm/io.h                  | 2 +-
>  include/linux/io-mapping.h                       | 2 +-
>  4 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/Documentation/PCI/pci.rst b/Documentation/PCI/pci.rst
> index 6864f9a70f5f..8c016d8c9862 100644
> --- a/Documentation/PCI/pci.rst
> +++ b/Documentation/PCI/pci.rst
> @@ -239,7 +239,7 @@ from the PCI device config space. Use the values in the pci_dev structure
>  as the PCI "bus address" might have been remapped to a "host physical"
>  address by the arch/chip-set specific kernel support.
>  
> -See Documentation/io-mapping.txt for how to access device registers
> +See Documentation/driver-api/io-mapping.rst for how to access device registers
>  or device memory.
>  
>  The device driver needs to call pci_request_region() to verify
> diff --git a/Documentation/translations/zh_CN/io_ordering.txt b/Documentation/translations/zh_CN/io_ordering.txt
> index 1f8127bdd415..7bb3086227ae 100644
> --- a/Documentation/translations/zh_CN/io_ordering.txt
> +++ b/Documentation/translations/zh_CN/io_ordering.txt
> @@ -1,4 +1,4 @@
> -Chinese translated version of Documentation/io_ordering.txt
> +Chinese translated version of Documentation/driver-api/io_ordering.rst
>  
>  If you have any comment or update to the content, please contact the
>  original document maintainer directly.  However, if you have a problem
> @@ -8,7 +8,7 @@ or if there is a problem with the translation.
>  
>  Chinese maintainer: Lin Yongting <linyongting@gmail.com>
>  ---------------------------------------------------------------------
> -Documentation/io_ordering.txt 的中文翻译
> +Documentation/driver-api/io_ordering.rst 的中文翻译
>  
>  如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文
>  交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻
> diff --git a/arch/unicore32/include/asm/io.h b/arch/unicore32/include/asm/io.h
> index 3ca74e1cde7d..bd4e7c332f85 100644
> --- a/arch/unicore32/include/asm/io.h
> +++ b/arch/unicore32/include/asm/io.h
> @@ -27,7 +27,7 @@ extern void __uc32_iounmap(volatile void __iomem *addr);
>   * ioremap and friends.
>   *
>   * ioremap takes a PCI memory address, as specified in
> - * Documentation/io-mapping.txt.
> + * Documentation/driver-api/io-mapping.rst.
>   *
>   */
>  #define ioremap(cookie, size)		__uc32_ioremap(cookie, size)
> diff --git a/include/linux/io-mapping.h b/include/linux/io-mapping.h
> index 837058bc1c9f..b336622612f3 100644
> --- a/include/linux/io-mapping.h
> +++ b/include/linux/io-mapping.h
> @@ -16,7 +16,7 @@
>   * The io_mapping mechanism provides an abstraction for mapping
>   * individual pages from an io device to the CPU in an efficient fashion.
>   *
> - * See Documentation/io-mapping.txt
> + * See Documentation/driver-api/io-mapping.rst
>   */
>  
>  struct io_mapping {
> -- 
> 2.24.1
> 

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH] docs: fix pointers to io-mapping.rst and io_ordering.rst files

[Jonathan Corbet]

On Wed, 11 Mar 2020 12:51:17 +0100
Mauro Carvalho Chehab <mchehab+huawei@kernel.org> wrote:

> Those files got moved, but cross-references still point to the
> wrong places.
> 
> Fixes: fcd680727157 ("Documentation: Add io-mapping.rst to driver-api manual")
> Fixes: d1ce350015d8 ("Documentation: Add io_ordering.rst to driver-api manual")
> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

Sigh...applied, thanks, sorry you had to fix these.

jon