Skip to content

Commit 5f1cda5

Browse files
andy-shevjwrdegoede
authored andcommitted
platform/x86: intel_scu_wdt: Move intel_scu_wdt.h to x86 subfolder
This is a platform/x86 library that can only be used on x86 devices. so it makes sense that it lives under the platform_data/x86/ directory instead. No functional changes intended. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Link: https://lore.kernel.org/r/20240909124952.1152017-4-andriy.shevchenko@linux.intel.com Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
1 parent c912ac6 commit 5f1cda5

3 files changed

Lines changed: 6 additions & 5 deletions

File tree

drivers/platform/x86/intel_scu_wdt.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@
99
#include <linux/init.h>
1010
#include <linux/interrupt.h>
1111
#include <linux/platform_device.h>
12-
#include <linux/platform_data/intel-mid_wdt.h>
1312

1413
#include <asm/cpu_device_id.h>
1514
#include <asm/intel-family.h>
1615
#include <asm/io_apic.h>
1716
#include <asm/hw_irq.h>
1817

18+
#include <linux/platform_data/x86/intel-mid_wdt.h>
19+
1920
#define TANGIER_EXT_TIMER0_MSI 12
2021

2122
static struct platform_device wdt_dev = {

drivers/watchdog/intel-mid_wdt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <linux/types.h>
2121
#include <linux/watchdog.h>
2222

23-
#include <linux/platform_data/intel-mid_wdt.h>
23+
#include <linux/platform_data/x86/intel-mid_wdt.h>
2424
#include <linux/platform_data/x86/intel_scu_ipc.h>
2525

2626
#define IPC_WATCHDOG 0xf8

include/linux/platform_data/intel-mid_wdt.h renamed to include/linux/platform_data/x86/intel-mid_wdt.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
* Contact: David Cohen <david.a.cohen@linux.intel.com>
77
*/
88

9-
#ifndef __INTEL_MID_WDT_H__
10-
#define __INTEL_MID_WDT_H__
9+
#ifndef __PLATFORM_X86_INTEL_MID_WDT_H_
10+
#define __PLATFORM_X86_INTEL_MID_WDT_H_
1111

1212
#include <linux/platform_device.h>
1313

@@ -16,4 +16,4 @@ struct intel_mid_wdt_pdata {
1616
int (*probe)(struct platform_device *pdev);
1717
};
1818

19-
#endif /*__INTEL_MID_WDT_H__*/
19+
#endif /* __PLATFORM_X86_INTEL_MID_WDT_H_ */

0 commit comments

Comments
 (0)