From: Jingchang Lu <b35083-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
To: wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org
Cc: shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org,
fabio.estevam-KZfg59tc24xl57MIdRCFDg@public.gmane.org,
s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org,
linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
Jingchang Lu <b35083-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
Subject: [PATCH 3/8] i2c: imx: don't change platform device id_entry directly
Date: Wed, 7 Aug 2013 17:05:38 +0800 [thread overview]
Message-ID: <1375866343-2074-3-git-send-email-b35083@freescale.com> (raw)
In-Reply-To: <1375866343-2074-1-git-send-email-b35083-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
The id_entry field should be changed by platform driver core,
driver should prevent changing it derectly. Use local variable
to save and extract platform_device_id info of the dts devices
instead.
Signed-off-by: Jingchang Lu <b35083-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
---
drivers/i2c/busses/i2c-imx.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index 7adb351..cbea84b 100644
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -499,6 +499,7 @@ static int __init i2c_imx_probe(struct platform_device *pdev)
struct imx_i2c_struct *i2c_imx;
struct resource *res;
struct imxi2c_platform_data *pdata = pdev->dev.platform_data;
+ const struct platform_device_id *imx_id;
void __iomem *base;
int irq, ret;
u32 bitrate;
@@ -524,8 +525,11 @@ static int __init i2c_imx_probe(struct platform_device *pdev)
}
if (of_id)
- pdev->id_entry = of_id->data;
- i2c_imx->devtype = pdev->id_entry->driver_data;
+ imx_id = of_id->data;
+ else
+ imx_id = platform_get_device_id(pdev);
+
+ i2c_imx->devtype = imx_id->driver_data;
/* Setup i2c_imx driver structure */
strlcpy(i2c_imx->adapter.name, pdev->name, sizeof(i2c_imx->adapter.name));
--
1.8.0
next prev parent reply other threads:[~2013-08-07 9:05 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-07 9:05 [PATCH 1/8] i2c: imx: use struct representing i2c clk{div, val} pair Jingchang Lu
[not found] ` <1375866343-2074-1-git-send-email-b35083-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2013-08-07 9:05 ` [PATCH 2/8] i2c: imx: enable clk before write to registers Jingchang Lu
2013-08-07 9:05 ` Jingchang Lu [this message]
2013-08-07 9:05 ` [PATCH 4/8] i2c: imx: wrap registers read/write to inline function Jingchang Lu
2013-08-07 9:05 ` [PATCH 5/8] i2c: imx: change register offset representation Jingchang Lu
2013-08-07 9:05 ` [PATCH 6/8] i2c: imx: add INT flag and IEN bit operatation codes Jingchang Lu
2013-08-07 9:05 ` [PATCH 7/8] i2c: imx: add struct to hold more configurable quirks Jingchang Lu
2013-08-07 9:05 ` [PATCH 8/8] i2c: imx: Add Vybrid VF610 I2C controller support Jingchang Lu
2013-08-07 17:53 ` [PATCH 1/8] i2c: imx: use struct representing i2c clk{div, val} pair Sascha Hauer
[not found] ` <20130807175337.GQ26614-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2013-08-09 8:12 ` Lu Jingchang-B35083
2013-08-15 14:15 ` Wolfram Sang
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=1375866343-2074-3-git-send-email-b35083@freescale.com \
--to=b35083-kzfg59tc24xl57midrcfdg@public.gmane.org \
--cc=fabio.estevam-KZfg59tc24xl57MIdRCFDg@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org \
--cc=shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
--cc=wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.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).