From: Wolfram Sang <wsa@the-dreams.de>
To: linux-kernel@vger.kernel.org
Cc: Wolfram Sang <wsa@the-dreams.de>,
Tony Lindgren <tony@atomide.com>,
linux-omap@vger.kernel.org, linux-i2c@vger.kernel.org
Subject: [PATCH 02/12] drivers/i2c/busses: don't use devm_pinctrl_get_select_default() in probe
Date: Wed, 10 Jul 2013 16:57:37 +0100 [thread overview]
Message-ID: <1373471889-18107-2-git-send-email-wsa@the-dreams.de> (raw)
In-Reply-To: <1373471889-18107-1-git-send-email-wsa@the-dreams.de>
Since commit ab78029 (drivers/pinctrl: grab default handles from device core),
we can rely on device core for setting the default pins. Compile tested only.
Acked-by: Linus Walleij <linus.walleij@linaro.org> (personally at LCE13)
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
---
drivers/i2c/busses/i2c-omap.c | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 142b694d..d09512e 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -43,7 +43,6 @@
#include <linux/slab.h>
#include <linux/i2c-omap.h>
#include <linux/pm_runtime.h>
-#include <linux/pinctrl/consumer.h>
/* I2C controller revisions */
#define OMAP_I2C_OMAP1_REV_2 0x20
@@ -216,8 +215,6 @@ struct omap_i2c_dev {
u16 syscstate;
u16 westate;
u16 errata;
-
- struct pinctrl *pins;
};
static const u8 reg_map_ip_v1[] = {
@@ -1120,16 +1117,6 @@ omap_i2c_probe(struct platform_device *pdev)
dev->set_mpu_wkup_lat = pdata->set_mpu_wkup_lat;
}
- dev->pins = devm_pinctrl_get_select_default(&pdev->dev);
- if (IS_ERR(dev->pins)) {
- if (PTR_ERR(dev->pins) == -EPROBE_DEFER)
- return -EPROBE_DEFER;
-
- dev_warn(&pdev->dev, "did not get pins for i2c error: %li\n",
- PTR_ERR(dev->pins));
- dev->pins = NULL;
- }
-
dev->dev = &pdev->dev;
dev->irq = irq;
--
1.7.10.4
next prev parent reply other threads:[~2013-07-10 15:59 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-10 15:57 [PATCH 01/12] drivers/gpu/drm/tilcdc: " Wolfram Sang
2013-07-10 15:57 ` Wolfram Sang [this message]
2013-08-07 15:37 ` [PATCH 02/12] drivers/i2c/busses: " Wolfram Sang
2013-07-10 15:57 ` [PATCH 03/12] drivers/misc: " Wolfram Sang
2013-07-10 23:13 ` Arnd Bergmann
2013-07-20 17:45 ` Linus Walleij
2013-07-20 17:50 ` Greg KH
2013-07-10 15:57 ` [PATCH 04/12] drivers/mmc/host: " Wolfram Sang
2013-07-10 19:57 ` Marek Vasut
2013-07-12 3:39 ` Barry Song
2013-07-10 15:57 ` [PATCH 05/12] drivers/mtd/nand: " Wolfram Sang
2013-08-02 15:51 ` Artem Bityutskiy
2013-07-10 15:57 ` [PATCH 06/12] drivers/mtd/nand/gpmi-nand: " Wolfram Sang
2013-07-11 2:14 ` Huang Shijie
2013-07-11 2:19 ` Huang Shijie
2013-07-20 17:48 ` Linus Walleij
2013-08-02 15:37 ` Artem Bityutskiy
2013-07-10 15:57 ` [PATCH 07/12] drivers/net/can/c_can: " Wolfram Sang
2013-07-10 21:02 ` Marc Kleine-Budde
2013-07-10 21:14 ` David Miller
2013-07-12 0:18 ` David Miller
2013-07-10 15:57 ` [PATCH 08/12] drivers/net/ethernet/cadence: " Wolfram Sang
2013-07-11 7:40 ` Nicolas Ferre
2013-07-12 0:19 ` David Miller
2013-07-10 15:57 ` [PATCH 09/12] drivers/net/ieee802154: " Wolfram Sang
2013-07-12 0:19 ` David Miller
2013-07-10 15:57 ` [PATCH 10/12] drivers/pwm: " Wolfram Sang
2013-07-10 15:57 ` [PATCH 11/12] drivers/tty/serial: " Wolfram Sang
2013-07-11 7:40 ` Nicolas Ferre
2013-07-20 17:46 ` Linus Walleij
2013-07-20 17:50 ` Greg KH
2013-07-10 15:57 ` [PATCH 12/12] drivers/video: " 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=1373471889-18107-2-git-send-email-wsa@the-dreams.de \
--to=wsa@the-dreams.de \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=tony@atomide.com \
/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
all inboxes | Powered by JetHome®