Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4f452e8aa492c0b8028ca9b4bdb4d018ba28c6c7

Authored by Kumar Gala
Committed by Greg Kroah-Hartman
1 parent a4ca661742
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

devres: support addresses greater than an unsigned long via dev_ioremap 

Use a resource_size_t instead of unsigned long since some arch's are
capable of having ioremap deal with addresses greater than the size of a
unsigned long.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Cc: Tejun Heo <htejun@gmail.com>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Showing 2 changed files with 4 additions and 4 deletions Side-by-side Diff

... ... @@ -58,9 +58,9 @@
58 58 }
59 59 #endif
60 60  
61   -void __iomem * devm_ioremap(struct device *dev, unsigned long offset,
  61 +void __iomem *devm_ioremap(struct device *dev, resource_size_t offset,
62 62 unsigned long size);
63   -void __iomem * devm_ioremap_nocache(struct device *dev, unsigned long offset,
  63 +void __iomem *devm_ioremap_nocache(struct device *dev, resource_size_t offset,
64 64 unsigned long size);
65 65 void devm_iounmap(struct device *dev, void __iomem *addr);
66 66 int check_signature(const volatile void __iomem *io_addr,
... ... @@ -20,7 +20,7 @@
20 20 *
21 21 * Managed ioremap(). Map is automatically unmapped on driver detach.
22 22 */
23   -void __iomem *devm_ioremap(struct device *dev, unsigned long offset,
  23 +void __iomem *devm_ioremap(struct device *dev, resource_size_t offset,
24 24 unsigned long size)
25 25 {
26 26 void __iomem **ptr, *addr;
... ... @@ -49,7 +49,7 @@
49 49 * Managed ioremap_nocache(). Map is automatically unmapped on driver
50 50 * detach.
51 51 */
52   -void __iomem *devm_ioremap_nocache(struct device *dev, unsigned long offset,
  52 +void __iomem *devm_ioremap_nocache(struct device *dev, resource_size_t offset,
53 53 unsigned long size)
54 54 {
55 55 void __iomem **ptr, *addr;