From: lee.jones@linaro.org (Lee Jones)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 04/12] mfd: stmpe: Rid data size incompatibility warn when building for 64bit
Date: Wed, 2 Jul 2014 16:28:36 +0100 [thread overview]
Message-ID: <1404314924-23564-5-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1404314924-23564-1-git-send-email-lee.jones@linaro.org>
Extinguishes:
../drivers/mfd/stmpe-i2c.c: In function ?stmpe_i2c_probe?:
../drivers/mfd/stmpe-i2c.c:88:13:
warning: cast from pointer to integer of different size
partnum = (int)of_id->data;
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/mfd/stmpe-i2c.c | 4 ++--
drivers/mfd/stmpe.c | 2 +-
drivers/mfd/stmpe.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/mfd/stmpe-i2c.c b/drivers/mfd/stmpe-i2c.c
index a45f9c0..5c05403 100644
--- a/drivers/mfd/stmpe-i2c.c
+++ b/drivers/mfd/stmpe-i2c.c
@@ -68,7 +68,7 @@ MODULE_DEVICE_TABLE(of, stmpe_of_match);
static int
stmpe_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
{
- int partnum;
+ enum stmpe_partnum partnum;
const struct of_device_id *of_id;
i2c_ci.data = (void *)id;
@@ -85,7 +85,7 @@ stmpe_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
dev_info(&i2c->dev, "matching on node name, compatible is preferred\n");
partnum = id->driver_data;
} else
- partnum = (int)of_id->data;
+ partnum = (enum stmpe_partnum)of_id->data;
return stmpe_probe(&i2c_ci, partnum);
}
diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
index 3b6bfa7..02a17c3 100644
--- a/drivers/mfd/stmpe.c
+++ b/drivers/mfd/stmpe.c
@@ -1147,7 +1147,7 @@ static void stmpe_of_probe(struct stmpe_platform_data *pdata,
}
/* Called from client specific probe routines */
-int stmpe_probe(struct stmpe_client_info *ci, int partnum)
+int stmpe_probe(struct stmpe_client_info *ci, enum stmpe_partnum partnum)
{
struct stmpe_platform_data *pdata = dev_get_platdata(ci->dev);
struct device_node *np = ci->dev->of_node;
diff --git a/drivers/mfd/stmpe.h b/drivers/mfd/stmpe.h
index 9e4d21d..2d045f2 100644
--- a/drivers/mfd/stmpe.h
+++ b/drivers/mfd/stmpe.h
@@ -97,7 +97,7 @@ struct stmpe_client_info {
void (*init)(struct stmpe *stmpe);
};
-int stmpe_probe(struct stmpe_client_info *ci, int partnum);
+int stmpe_probe(struct stmpe_client_info *ci, enum stmpe_partnum partnum);
int stmpe_remove(struct stmpe *stmpe);
#define STMPE_ICR_LSB_HIGH (1 << 2)
--
1.8.3.2
next prev parent reply other threads:[~2014-07-02 15:28 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-02 15:28 [PATCH 01/12] mfd: Bunch of clean-ups and checkpatch fixes Lee Jones
2014-07-02 15:28 ` [PATCH 01/12] mfd: ab8500-core: Remove pointless else in if statement Lee Jones
2014-07-04 19:54 ` Linus Walleij
2014-07-02 15:28 ` [PATCH 02/12] mfd: ab8500-debugfs: Simplify invalid debugfs data checking Lee Jones
2014-07-04 19:55 ` Linus Walleij
2014-07-02 15:28 ` [PATCH 03/12] mfd: intel_soc_pmic: Rid compiler working for unused ACPI match table Lee Jones
2014-07-02 15:28 ` Lee Jones [this message]
2014-07-04 19:57 ` [PATCH 04/12] mfd: stmpe: Rid data size incompatibility warn when building for 64bit Linus Walleij
2014-07-02 15:28 ` [PATCH 05/12] mfd: arizona: " Lee Jones
2014-07-02 15:28 ` [PATCH 06/12] mfd: tps65910: " Lee Jones
2014-07-02 15:28 ` [PATCH 07/12] mfd: 88pm805: msleep(1ms ~ 20ms) may not do what the caller intends Lee Jones
2014-07-02 15:28 ` [PATCH 08/12] mfd: 88pm860x-core: Repair formatting issues Lee Jones
2014-07-02 15:28 ` [PATCH 09/12] mfd: 88pm860x-i2c: Repair 'space before tab' warning Lee Jones
2014-07-02 15:28 ` [PATCH 10/12] mfd: aat2870-core: Stop using obsolte simple_strtoul() Lee Jones
2014-07-02 15:28 ` [PATCH 11/12] mfd: ab3100-core: Correct code sytle problems Lee Jones
2014-07-04 19:58 ` Linus Walleij
2014-07-07 12:50 ` Lee Jones
2014-07-02 15:28 ` [PATCH 12/12] mfd: ab8500-core: Resolve code style issues Lee Jones
2014-07-04 19:58 ` Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1404314924-23564-5-git-send-email-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).