Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf4a7c05 authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Konrad Rzeszutek Wilk
Browse files

tpm: xen-tpmfront: Remove the locality sysfs attribute 



Upon deeper review it was agreed to remove the driver-unique
'locality' sysfs attribute before it is present in a released
kernel.

The attribute was introduced in e2683957
during the 3.12 merge window, so this patch needs to go in before
3.12 is released.

The hope is to have a well defined locality API that all the other
locality aware drivers can use, perhaps in 3.13.

Signed-off-by: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Acked-by: default avatarDaniel De Graaf <dgdegra@tycho.nsa.gov>
parent 56be8895

drivers/char/tpm/xen-tpmfront.c

+0 −29
Original line number Diff line number Diff line
@@ -142,32 +142,6 @@ static int vtpm_recv(struct tpm_chip *chip, u8 *buf, size_t count) 
	return length;

}



ssize_t tpm_show_locality(struct device *dev, struct device_attribute *attr,

			  char *buf)

{

	struct tpm_chip *chip = dev_get_drvdata(dev);

	struct tpm_private *priv = TPM_VPRIV(chip);

	u8 locality = priv->shr->locality;



	return sprintf(buf, "%d\n", locality);

}



ssize_t tpm_store_locality(struct device *dev, struct device_attribute *attr,

			const char *buf, size_t len)

{

	struct tpm_chip *chip = dev_get_drvdata(dev);

	struct tpm_private *priv = TPM_VPRIV(chip);

	u8 val;



	int rv = kstrtou8(buf, 0, &val);

	if (rv)

		return rv;



	priv->shr->locality = val;



	return len;

}



static const struct file_operations vtpm_ops = {

	.owner = THIS_MODULE,

	.llseek = no_llseek,
@@ -188,8 +162,6 @@ static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps, NULL); 
static DEVICE_ATTR(cancel, S_IWUSR | S_IWGRP, NULL, tpm_store_cancel);

static DEVICE_ATTR(durations, S_IRUGO, tpm_show_durations, NULL);

static DEVICE_ATTR(timeouts, S_IRUGO, tpm_show_timeouts, NULL);

static DEVICE_ATTR(locality, S_IRUGO | S_IWUSR, tpm_show_locality,

		tpm_store_locality);



static struct attribute *vtpm_attrs[] = {

	&dev_attr_pubek.attr,
@@ -202,7 +174,6 @@ static struct attribute *vtpm_attrs[] = { 
	&dev_attr_cancel.attr,

	&dev_attr_durations.attr,

	&dev_attr_timeouts.attr,

	&dev_attr_locality.attr,

	NULL,

};