Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

macintosh: Prepare cleanup of powerpc's asm/prom.h

powerpc's asm/prom.h brings some headers that it doesn't
need itself.

In order to clean it up, first add missing headers in
users of asm/prom.h

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/04961364547fe4556e30cb302b0e20a939b83426.1648833027.git.christophe.leroy@csgroup.eu

authored by

Christophe Leroy and committed by
Michael Ellerman
a486e512 17512892

+37 -31
+1 -1
drivers/macintosh/adb.c
··· 38 38 #include <linux/kthread.h> 39 39 #include <linux/platform_device.h> 40 40 #include <linux/mutex.h> 41 + #include <linux/of.h> 41 42 42 43 #include <linux/uaccess.h> 43 44 #ifdef CONFIG_PPC 44 - #include <asm/prom.h> 45 45 #include <asm/machdep.h> 46 46 #endif 47 47
+1 -1
drivers/macintosh/ans-lcd.c
··· 11 11 #include <linux/module.h> 12 12 #include <linux/delay.h> 13 13 #include <linux/fs.h> 14 + #include <linux/of.h> 14 15 15 16 #include <linux/uaccess.h> 16 17 #include <asm/sections.h> 17 - #include <asm/prom.h> 18 18 #include <asm/io.h> 19 19 20 20 #include "ans-lcd.h"
+4 -1
drivers/macintosh/macio-adb.c
··· 9 9 #include <linux/spinlock.h> 10 10 #include <linux/interrupt.h> 11 11 #include <linux/pgtable.h> 12 - #include <asm/prom.h> 12 + #include <linux/of.h> 13 + #include <linux/of_address.h> 14 + #include <linux/of_irq.h> 13 15 #include <linux/adb.h> 16 + 14 17 #include <asm/io.h> 15 18 #include <asm/hydra.h> 16 19 #include <asm/irq.h>
+2 -1
drivers/macintosh/macio_asic.c
··· 20 20 #include <linux/init.h> 21 21 #include <linux/module.h> 22 22 #include <linux/slab.h> 23 + #include <linux/of.h> 23 24 #include <linux/of_address.h> 25 + #include <linux/of_device.h> 24 26 #include <linux/of_irq.h> 25 27 26 28 #include <asm/machdep.h> 27 29 #include <asm/macio.h> 28 30 #include <asm/pmac_feature.h> 29 - #include <asm/prom.h> 30 31 31 32 #undef DEBUG 32 33
+2
drivers/macintosh/macio_sysfs.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 2 #include <linux/kernel.h> 3 + #include <linux/of.h> 4 + #include <linux/of_device.h> 3 5 #include <linux/stat.h> 4 6 #include <asm/macio.h> 5 7
+1 -1
drivers/macintosh/mediabay.c
··· 17 17 #include <linux/kthread.h> 18 18 #include <linux/mutex.h> 19 19 #include <linux/pgtable.h> 20 - #include <asm/prom.h> 20 + 21 21 #include <asm/io.h> 22 22 #include <asm/machdep.h> 23 23 #include <asm/pmac_feature.h>
-1
drivers/macintosh/rack-meter.c
··· 27 27 #include <linux/of_irq.h> 28 28 29 29 #include <asm/io.h> 30 - #include <asm/prom.h> 31 30 #include <asm/machdep.h> 32 31 #include <asm/pmac_feature.h> 33 32 #include <asm/dbdma.h>
-1
drivers/macintosh/smu.c
··· 41 41 42 42 #include <asm/byteorder.h> 43 43 #include <asm/io.h> 44 - #include <asm/prom.h> 45 44 #include <asm/machdep.h> 46 45 #include <asm/pmac_feature.h> 47 46 #include <asm/smu.h>
-1
drivers/macintosh/therm_adt746x.c
··· 27 27 #include <linux/freezer.h> 28 28 #include <linux/of_platform.h> 29 29 30 - #include <asm/prom.h> 31 30 #include <asm/machdep.h> 32 31 #include <asm/io.h> 33 32 #include <asm/sections.h>
-1
drivers/macintosh/therm_windtunnel.c
··· 38 38 #include <linux/kthread.h> 39 39 #include <linux/of_platform.h> 40 40 41 - #include <asm/prom.h> 42 41 #include <asm/machdep.h> 43 42 #include <asm/io.h> 44 43 #include <asm/sections.h>
+3 -1
drivers/macintosh/via-cuda.c
··· 18 18 #include <linux/cuda.h> 19 19 #include <linux/spinlock.h> 20 20 #include <linux/interrupt.h> 21 + #include <linux/of_address.h> 22 + #include <linux/of_irq.h> 23 + 21 24 #ifdef CONFIG_PPC 22 - #include <asm/prom.h> 23 25 #include <asm/machdep.h> 24 26 #include <asm/pmac_feature.h> 25 27 #else
-1
drivers/macintosh/via-pmu-backlight.c
··· 12 12 #include <linux/adb.h> 13 13 #include <linux/pmu.h> 14 14 #include <asm/backlight.h> 15 - #include <asm/prom.h> 16 15 17 16 #define MAX_PMU_LEVEL 0xFF 18 17
+1 -1
drivers/macintosh/via-pmu-led.c
··· 25 25 #include <linux/leds.h> 26 26 #include <linux/adb.h> 27 27 #include <linux/pmu.h> 28 - #include <asm/prom.h> 28 + #include <linux/of.h> 29 29 30 30 static spinlock_t pmu_blink_lock; 31 31 static struct adb_request pmu_blink_req;
-1
drivers/macintosh/via-pmu.c
··· 59 59 #include <asm/pmac_feature.h> 60 60 #include <asm/pmac_pfunc.h> 61 61 #include <asm/pmac_low_i2c.h> 62 - #include <asm/prom.h> 63 62 #include <asm/mmu_context.h> 64 63 #include <asm/cputable.h> 65 64 #include <asm/time.h>
+1 -1
drivers/macintosh/windfarm_ad7417_sensor.c
··· 13 13 #include <linux/init.h> 14 14 #include <linux/wait.h> 15 15 #include <linux/i2c.h> 16 - #include <asm/prom.h> 16 + 17 17 #include <asm/machdep.h> 18 18 #include <asm/io.h> 19 19 #include <asm/sections.h>
-2
drivers/macintosh/windfarm_core.c
··· 35 35 #include <linux/mutex.h> 36 36 #include <linux/freezer.h> 37 37 38 - #include <asm/prom.h> 39 - 40 38 #include "windfarm.h" 41 39 42 40 #define VERSION "0.2"
-2
drivers/macintosh/windfarm_cpufreq_clamp.c
··· 10 10 #include <linux/cpu.h> 11 11 #include <linux/cpufreq.h> 12 12 13 - #include <asm/prom.h> 14 - 15 13 #include "windfarm.h" 16 14 17 15 #define VERSION "0.3"
+1 -1
drivers/macintosh/windfarm_fcu_controls.c
··· 14 14 #include <linux/init.h> 15 15 #include <linux/wait.h> 16 16 #include <linux/i2c.h> 17 - #include <asm/prom.h> 17 + 18 18 #include <asm/machdep.h> 19 19 #include <asm/io.h> 20 20 #include <asm/sections.h>
-1
drivers/macintosh/windfarm_lm75_sensor.c
··· 15 15 #include <linux/wait.h> 16 16 #include <linux/i2c.h> 17 17 #include <linux/of_device.h> 18 - #include <asm/prom.h> 19 18 #include <asm/machdep.h> 20 19 #include <asm/io.h> 21 20 #include <asm/sections.h>
+1 -1
drivers/macintosh/windfarm_lm87_sensor.c
··· 13 13 #include <linux/init.h> 14 14 #include <linux/wait.h> 15 15 #include <linux/i2c.h> 16 - #include <asm/prom.h> 16 + 17 17 #include <asm/machdep.h> 18 18 #include <asm/io.h> 19 19 #include <asm/sections.h>
+1 -1
drivers/macintosh/windfarm_max6690_sensor.c
··· 10 10 #include <linux/init.h> 11 11 #include <linux/slab.h> 12 12 #include <linux/i2c.h> 13 - #include <asm/prom.h> 13 + 14 14 #include <asm/pmac_low_i2c.h> 15 15 16 16 #include "windfarm.h"
+2
drivers/macintosh/windfarm_mpu.h
··· 8 8 #ifndef __WINDFARM_MPU_H 9 9 #define __WINDFARM_MPU_H 10 10 11 + #include <linux/of.h> 12 + 11 13 typedef unsigned short fu16; 12 14 typedef int fs32; 13 15 typedef short fs16;
+3 -1
drivers/macintosh/windfarm_pm112.c
··· 12 12 #include <linux/device.h> 13 13 #include <linux/platform_device.h> 14 14 #include <linux/reboot.h> 15 - #include <asm/prom.h> 15 + #include <linux/of.h> 16 + #include <linux/slab.h> 17 + 16 18 #include <asm/smu.h> 17 19 18 20 #include "windfarm.h"
+2 -1
drivers/macintosh/windfarm_pm121.c
··· 201 201 #include <linux/kmod.h> 202 202 #include <linux/device.h> 203 203 #include <linux/platform_device.h> 204 - #include <asm/prom.h> 204 + #include <linux/of.h> 205 + 205 206 #include <asm/machdep.h> 206 207 #include <asm/io.h> 207 208 #include <asm/sections.h>
+1 -1
drivers/macintosh/windfarm_pm72.c
··· 11 11 #include <linux/device.h> 12 12 #include <linux/platform_device.h> 13 13 #include <linux/reboot.h> 14 - #include <asm/prom.h> 14 + 15 15 #include <asm/smu.h> 16 16 17 17 #include "windfarm.h"
+2 -1
drivers/macintosh/windfarm_pm81.c
··· 102 102 #include <linux/kmod.h> 103 103 #include <linux/device.h> 104 104 #include <linux/platform_device.h> 105 - #include <asm/prom.h> 105 + #include <linux/of.h> 106 + 106 107 #include <asm/machdep.h> 107 108 #include <asm/io.h> 108 109 #include <asm/sections.h>
+2 -1
drivers/macintosh/windfarm_pm91.c
··· 37 37 #include <linux/kmod.h> 38 38 #include <linux/device.h> 39 39 #include <linux/platform_device.h> 40 - #include <asm/prom.h> 40 + #include <linux/of.h> 41 + 41 42 #include <asm/machdep.h> 42 43 #include <asm/io.h> 43 44 #include <asm/sections.h>
+1 -1
drivers/macintosh/windfarm_rm31.c
··· 11 11 #include <linux/device.h> 12 12 #include <linux/platform_device.h> 13 13 #include <linux/reboot.h> 14 - #include <asm/prom.h> 14 + 15 15 #include <asm/smu.h> 16 16 17 17 #include "windfarm.h"
+2 -1
drivers/macintosh/windfarm_smu_controls.c
··· 14 14 #include <linux/init.h> 15 15 #include <linux/wait.h> 16 16 #include <linux/completion.h> 17 - #include <asm/prom.h> 17 + #include <linux/of.h> 18 + 18 19 #include <asm/machdep.h> 19 20 #include <asm/io.h> 20 21 #include <asm/sections.h>
+1 -1
drivers/macintosh/windfarm_smu_sat.c
··· 13 13 #include <linux/wait.h> 14 14 #include <linux/i2c.h> 15 15 #include <linux/mutex.h> 16 - #include <asm/prom.h> 16 + 17 17 #include <asm/smu.h> 18 18 #include <asm/pmac_low_i2c.h> 19 19
+2 -1
drivers/macintosh/windfarm_smu_sensors.c
··· 14 14 #include <linux/init.h> 15 15 #include <linux/wait.h> 16 16 #include <linux/completion.h> 17 - #include <asm/prom.h> 17 + #include <linux/of.h> 18 + 18 19 #include <asm/machdep.h> 19 20 #include <asm/io.h> 20 21 #include <asm/sections.h>