diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-05-04 20:15:18 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-05-07 16:32:19 +0300 |
| commit | 32988cfd579f7912aeb9a66bf44ca4ce0fa860f1 (patch) | |
| tree | adb5167f70d8f6b32da61f789bee6f6b593d570d /arch | |
| parent | 30ad8db3a2c2e0121202342c6c2a48fc28937056 (diff) | |
| download | linux-32988cfd579f7912aeb9a66bf44ca4ce0fa860f1.tar.xz | |
x86/platform/uv: Remove the uv_partition_coherence_id() macro
uv_partition_coherence_id() is only used once. Just open code it in the
only user.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Not-acked-by: Dimitri Sivanich <sivanich@hpe.com>
Cc: Russ Anderson <rja@hpe.com>
Link: https://lkml.kernel.org/r/20200504171527.2845224-3-hch@lst.de
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/include/asm/uv/bios.h | 1 | ||||
| -rw-r--r-- | arch/x86/platform/uv/uv_sysfs.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/include/asm/uv/bios.h b/arch/x86/include/asm/uv/bios.h index fc85dafa5e49..2fcc3ac12e76 100644 --- a/arch/x86/include/asm/uv/bios.h +++ b/arch/x86/include/asm/uv/bios.h @@ -140,7 +140,6 @@ extern long sn_partition_id; extern long sn_coherency_id; extern long sn_region_size; extern long system_serial_number; -#define uv_partition_coherence_id() (sn_coherency_id) extern struct kobject *sgi_uv_kobj; /* /sys/firmware/sgi_uv */ diff --git a/arch/x86/platform/uv/uv_sysfs.c b/arch/x86/platform/uv/uv_sysfs.c index 62214731fea5..266773e2fb37 100644 --- a/arch/x86/platform/uv/uv_sysfs.c +++ b/arch/x86/platform/uv/uv_sysfs.c @@ -21,7 +21,7 @@ static ssize_t partition_id_show(struct kobject *kobj, static ssize_t coherence_id_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf) { - return snprintf(buf, PAGE_SIZE, "%ld\n", uv_partition_coherence_id()); + return snprintf(buf, PAGE_SIZE, "%ld\n", sn_coherency_id); } static struct kobj_attribute partition_id_attr = |