Skip to content

Commit

Permalink
x86/platform/uv: Remove the uv_partition_coherence_id() macro
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Christoph Hellwig authored and Thomas Gleixner committed May 7, 2020
1 parent 30ad8db commit 32988cf
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion arch/x86/include/asm/uv/bios.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down
2 changes: 1 addition & 1 deletion arch/x86/platform/uv/uv_sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down

0 comments on commit 32988cf

Please sign in to comment.