The patch titled
tpm: compiler cleanup
has been removed from the -mm tree. Its filename is
tpm-new-12-sysfs-files-fix-fix.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: Kylene Jo Hall <kjhall@xxxxxxxxxx>
Fix compiler warnings about strict type checking with the max macro.
Signed-off-by: Kylie Hall <kjhall@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/char/tpm/tpm.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff -puN drivers/char/tpm/tpm.c~tpm-new-12-sysfs-files-fix-fix drivers/char/tpm/tpm.c
--- 25/drivers/char/tpm/tpm.c~tpm-new-12-sysfs-files-fix-fix Tue Apr 11 15:41:09 2006
+++ 25-akpm/drivers/char/tpm/tpm.c Tue Apr 11 15:41:09 2006
@@ -486,7 +486,7 @@ static ssize_t transmit_cmd(struct tpm_c
void tpm_gen_interrupt(struct tpm_chip *chip)
{
- u8 data[max(ARRAY_SIZE(tpm_cap), 30)];
+ u8 data[max_t(int, ARRAY_SIZE(tpm_cap), 30)];
ssize_t rc;
memcpy(data, tpm_cap, sizeof(tpm_cap));
@@ -500,7 +500,7 @@ EXPORT_SYMBOL_GPL(tpm_gen_interrupt);
void tpm_get_timeouts(struct tpm_chip *chip)
{
- u8 data[max(ARRAY_SIZE(tpm_cap), 30)];
+ u8 data[max_t(int, ARRAY_SIZE(tpm_cap), 30)];
ssize_t rc;
u32 timeout;
@@ -573,7 +573,7 @@ EXPORT_SYMBOL_GPL(tpm_continue_selftest)
ssize_t tpm_show_enabled(struct device * dev, struct device_attribute * attr,
char *buf)
{
- u8 data[max(ARRAY_SIZE(tpm_cap), 30)];
+ u8 data[max_t(int, ARRAY_SIZE(tpm_cap), 30)];
ssize_t rc;
struct tpm_chip *chip = dev_get_drvdata(dev);
@@ -595,7 +595,7 @@ EXPORT_SYMBOL_GPL(tpm_show_enabled);
ssize_t tpm_show_active(struct device * dev, struct device_attribute * attr,
char *buf)
{
- u8 data[max(ARRAY_SIZE(tpm_cap), 35)];
+ u8 data[max_t(int, ARRAY_SIZE(tpm_cap), 35)];
ssize_t rc;
struct tpm_chip *chip = dev_get_drvdata(dev);
@@ -668,7 +668,7 @@ static const u8 pcrread[] = {
ssize_t tpm_show_pcrs(struct device *dev, struct device_attribute *attr,
char *buf)
{
- u8 data[max(max(ARRAY_SIZE(tpm_cap), ARRAY_SIZE(pcrread)), 30)];
+ u8 data[max_t(int, max(ARRAY_SIZE(tpm_cap), ARRAY_SIZE(pcrread)), 30)];
ssize_t rc;
int i, j, num_pcrs;
__be32 index;
@@ -785,7 +785,7 @@ static const u8 cap_version[] = {
ssize_t tpm_show_caps(struct device *dev, struct device_attribute *attr,
char *buf)
{
- u8 data[max(max(ARRAY_SIZE(tpm_cap), ARRAY_SIZE(cap_version)), 30)];
+ u8 data[max_t(int, max(ARRAY_SIZE(tpm_cap), ARRAY_SIZE(cap_version)), 30)];
ssize_t rc;
char *str = buf;
@@ -825,7 +825,7 @@ EXPORT_SYMBOL_GPL(tpm_show_caps);
ssize_t tpm_show_caps_1_2(struct device * dev,
struct device_attribute * attr, char *buf)
{
- u8 data[max(max(ARRAY_SIZE(tpm_cap), ARRAY_SIZE(cap_version)), 30)];
+ u8 data[max_t(int, max(ARRAY_SIZE(tpm_cap), ARRAY_SIZE(cap_version)), 30)];
ssize_t len;
char *str = buf;
_
Patches currently in -mm which might be from kjhall@xxxxxxxxxx are
tpm-fix-memory-leak.patch
tpm-fix-missing-string.patch
tpm-spacing-cleanups.patch
tpm-reorganize-sysfs-files.patch
tpm-chip-struct-update.patch
tpm-return-chip-from-tpm_register_hardware.patch
tpm-command-duration-update.patch
tpm-new-12-sysfs-files.patch
tpm-driver-for-next-generation-tpm-chips.patch
tpm-msecs_to_jiffies-cleanups.patch
tpm-use-clear_bit.patch
tpm-tpm_infineon-updated-to-latest-interface-changes.patch
tpm-check-mem-start-and-len.patch
tpm-update-bios-log-code-for-12.patch
tpm_infineon-section-fixup.patch
tpm-spacing-cleanups-2.patch
tpm-add-interrupt-module-parameter.patch
tpm-add-hid-module-paramater.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
