diff options
| author | Jason Gunthorpe <jgunthorpe@obsidianresearch.com> | 2013-09-23 16:54:15 -0400 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2013-09-24 16:15:15 -0400 |
| commit | bf4a7c054be1306dcee5d4f5028eb66caf714037 (patch) | |
| tree | 7a97fddb9f0a5703f9dfbc464c8270456089220f | |
| parent | 56be88954bdb3d77619a786bf301af01efb2b057 (diff) | |
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 e2683957fb268c6b29316fd9e7191e13239a30a5
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: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Acked-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>
| -rw-r--r-- | drivers/char/tpm/xen-tpmfront.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/drivers/char/tpm/xen-tpmfront.c b/drivers/char/tpm/xen-tpmfront.c index 6f2fe2b0ae56..06189e55b4e5 100644 --- a/drivers/char/tpm/xen-tpmfront.c +++ b/drivers/char/tpm/xen-tpmfront.c | |||
| @@ -142,32 +142,6 @@ static int vtpm_recv(struct tpm_chip *chip, u8 *buf, size_t count) | |||
| 142 | return length; | 142 | return length; |
| 143 | } | 143 | } |
| 144 | 144 | ||
| 145 | ssize_t tpm_show_locality(struct device *dev, struct device_attribute *attr, | ||
| 146 | char *buf) | ||
| 147 | { | ||
| 148 | struct tpm_chip *chip = dev_get_drvdata(dev); | ||
| 149 | struct tpm_private *priv = TPM_VPRIV(chip); | ||
| 150 | u8 locality = priv->shr->locality; | ||
| 151 | |||
| 152 | return sprintf(buf, "%d\n", locality); | ||
| 153 | } | ||
| 154 | |||
| 155 | ssize_t tpm_store_locality(struct device *dev, struct device_attribute *attr, | ||
| 156 | const char *buf, size_t len) | ||
| 157 | { | ||
| 158 | struct tpm_chip *chip = dev_get_drvdata(dev); | ||
| 159 | struct tpm_private *priv = TPM_VPRIV(chip); | ||
| 160 | u8 val; | ||
| 161 | |||
| 162 | int rv = kstrtou8(buf, 0, &val); | ||
| 163 | if (rv) | ||
| 164 | return rv; | ||
| 165 | |||
| 166 | priv->shr->locality = val; | ||
| 167 | |||
| 168 | return len; | ||
| 169 | } | ||
| 170 | |||
| 171 | static const struct file_operations vtpm_ops = { | 145 | static const struct file_operations vtpm_ops = { |
| 172 | .owner = THIS_MODULE, | 146 | .owner = THIS_MODULE, |
| 173 | .llseek = no_llseek, | 147 | .llseek = no_llseek, |
| @@ -188,8 +162,6 @@ static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps, NULL); | |||
| 188 | static DEVICE_ATTR(cancel, S_IWUSR | S_IWGRP, NULL, tpm_store_cancel); | 162 | static DEVICE_ATTR(cancel, S_IWUSR | S_IWGRP, NULL, tpm_store_cancel); |
| 189 | static DEVICE_ATTR(durations, S_IRUGO, tpm_show_durations, NULL); | 163 | static DEVICE_ATTR(durations, S_IRUGO, tpm_show_durations, NULL); |
| 190 | static DEVICE_ATTR(timeouts, S_IRUGO, tpm_show_timeouts, NULL); | 164 | static DEVICE_ATTR(timeouts, S_IRUGO, tpm_show_timeouts, NULL); |
| 191 | static DEVICE_ATTR(locality, S_IRUGO | S_IWUSR, tpm_show_locality, | ||
| 192 | tpm_store_locality); | ||
| 193 | 165 | ||
| 194 | static struct attribute *vtpm_attrs[] = { | 166 | static struct attribute *vtpm_attrs[] = { |
| 195 | &dev_attr_pubek.attr, | 167 | &dev_attr_pubek.attr, |
| @@ -202,7 +174,6 @@ static struct attribute *vtpm_attrs[] = { | |||
| 202 | &dev_attr_cancel.attr, | 174 | &dev_attr_cancel.attr, |
| 203 | &dev_attr_durations.attr, | 175 | &dev_attr_durations.attr, |
| 204 | &dev_attr_timeouts.attr, | 176 | &dev_attr_timeouts.attr, |
| 205 | &dev_attr_locality.attr, | ||
| 206 | NULL, | 177 | NULL, |
| 207 | }; | 178 | }; |
| 208 | 179 | ||
