LKML Archive on lore.kernel.org help / color / mirror / Atom feed
From: Anton Vorontsov <avorontsov@ru.mvista.com> To: Grant Likely <grant.likely@secretlab.ca>, David Brownell <david-b@pacbell.net> Cc: benh@kernel.crashing.org, linux-kernel@vger.kernel.org, David Miller <davem@davemloft.net> Subject: [PATCH 2/6] of/of_i2c: implement of_{,un}register_i2c_device Date: Tue, 28 Oct 2008 20:46:13 +0300 [thread overview] Message-ID: <20081028174613.GB25349@oksana.dev.rtsoft.ru> (raw) In-Reply-To: <20081028174532.GA23834@oksana.dev.rtsoft.ru> of_register_i2c_device is factored out of of_register_i2c_devices. Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> --- drivers/of/of_i2c.c | 71 +++++++++++++++++++++++++++++------------------ include/linux/of_i2c.h | 4 +++ 2 files changed, 48 insertions(+), 27 deletions(-) diff --git a/drivers/of/of_i2c.c b/drivers/of/of_i2c.c index 24bbef7..57de7c5 100644 --- a/drivers/of/of_i2c.c +++ b/drivers/of/of_i2c.c @@ -16,41 +16,58 @@ #include <linux/of_i2c.h> #include <linux/module.h> -void of_register_i2c_devices(struct i2c_adapter *adap, - struct device_node *adap_node) +struct i2c_client *of_register_i2c_device(struct i2c_adapter *adap, + struct i2c_board_info *info, + struct device_node *node) { - void *result; - struct device_node *node; + struct i2c_client *client; + const u32 *addr; + int len; - for_each_child_of_node(adap_node, node) { - struct i2c_board_info info = {}; - const u32 *addr; - int len; + if (of_modalias_node(node, info->type, sizeof(info->type))) + return NULL; - if (of_modalias_node(node, info.type, sizeof(info.type)) < 0) - continue; + addr = of_get_property(node, "reg", &len); + if (!addr || len < sizeof(int) || *addr > (1 << 10) - 1) { + printk(KERN_ERR + "of-i2c: invalid i2c device entry\n"); + return NULL; + } + + info->irq = irq_of_parse_and_map(node, 0); + info->addr = *addr; - addr = of_get_property(node, "reg", &len); - if (!addr || len < sizeof(int) || *addr > (1 << 10) - 1) { - printk(KERN_ERR - "of-i2c: invalid i2c device entry\n"); - continue; - } + request_module("%s", info->type); + + client = i2c_new_device(adap, info); + if (!client) { + printk(KERN_ERR + "of-i2c: Failed to load driver for %s\n", + info->type); + irq_dispose_mapping(info->irq); + return NULL; + } + return client; +} +EXPORT_SYMBOL(of_register_i2c_device); - info.irq = irq_of_parse_and_map(node, 0); +void of_unregister_i2c_device(struct i2c_client *client) +{ + if (client->irq) + irq_dispose_mapping(client->irq); + i2c_unregister_device(client); +} +EXPORT_SYMBOL(of_unregister_i2c_device); - info.addr = *addr; +void of_register_i2c_devices(struct i2c_adapter *adap, + struct device_node *adap_node) +{ + struct device_node *node; - request_module("%s", info.type); + for_each_child_of_node(adap_node, node) { + struct i2c_board_info info = {}; - result = i2c_new_device(adap, &info); - if (result == NULL) { - printk(KERN_ERR - "of-i2c: Failed to load driver for %s\n", - info.type); - irq_dispose_mapping(info.irq); - continue; - } + of_register_i2c_device(adap, &info, node); } } EXPORT_SYMBOL(of_register_i2c_devices); diff --git a/include/linux/of_i2c.h b/include/linux/of_i2c.h index bd2a870..68851c0 100644 --- a/include/linux/of_i2c.h +++ b/include/linux/of_i2c.h @@ -14,6 +14,10 @@ #include <linux/i2c.h> +struct i2c_client *of_register_i2c_device(struct i2c_adapter *adap, + struct i2c_board_info *info, + struct device_node *node); +void of_unregister_i2c_device(struct i2c_client *client); void of_register_i2c_devices(struct i2c_adapter *adap, struct device_node *adap_node); -- 1.5.6.3
next prev parent reply other threads:[~2008-10-28 17:46 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2008-10-16 17:12 [PATCH 0/7 RFC] Handle I2C GPIO controllers with the OF (was: pca9539 I2C gpio expander) Anton Vorontsov 2008-10-16 17:12 ` [PATCH 1/7] powerpc and sparc: introduce dev_archdata node accessors Anton Vorontsov 2008-10-16 22:36 ` David Miller 2008-10-16 23:02 ` Grant Likely 2008-10-16 17:12 ` [PATCH 2/7] i2c: add info->archdata field Anton Vorontsov 2008-10-17 9:21 ` Jean Delvare 2008-10-22 0:27 ` Benjamin Herrenschmidt 2008-10-22 6:50 ` Jean Delvare 2008-10-22 7:37 ` Benjamin Herrenschmidt 2008-10-22 10:08 ` Anton Vorontsov 2008-10-22 11:07 ` Jean Delvare 2008-10-22 12:50 ` Anton Vorontsov 2008-10-16 17:12 ` [PATCH 3/7] of: fill the archdata for I2C devices Anton Vorontsov 2008-10-22 4:14 ` Grant Likely 2008-10-16 17:12 ` [PATCH 4/7] gpiolib: implement dev_gpiochip_{add,remove} calls Anton Vorontsov 2008-10-17 20:24 ` David Brownell 2008-10-17 21:29 ` Anton Vorontsov 2008-10-20 7:29 ` David Brownell 2008-10-20 15:48 ` Anton Vorontsov 2008-10-22 0:29 ` Benjamin Herrenschmidt 2008-10-22 1:03 ` Anton Vorontsov 2008-10-22 1:42 ` Anton Vorontsov 2008-10-22 2:28 ` Benjamin Herrenschmidt 2008-10-22 4:20 ` Grant Likely 2008-10-22 4:22 ` David Brownell 2008-10-22 10:36 ` Anton Vorontsov 2008-10-22 10:46 ` Anton Vorontsov 2008-10-22 18:32 ` Anton Vorontsov 2008-10-22 21:04 ` David Brownell 2008-10-22 21:22 ` Anton Vorontsov 2008-10-22 21:52 ` David Brownell 2008-10-22 22:29 ` Anton Vorontsov 2008-10-23 5:19 ` David Brownell 2008-10-23 4:45 ` Benjamin Herrenschmidt 2008-10-23 6:06 ` David Brownell 2008-10-23 6:15 ` David Brownell 2008-10-28 17:45 ` [PATCH 0/6 RFC] OF-glue devices for I2C/SPI (was: " Anton Vorontsov 2008-10-28 17:46 ` [PATCH 1/6] of/base: Add new helper of_should_create_pdev() Anton Vorontsov 2008-10-28 17:46 ` Anton Vorontsov [this message] 2008-10-28 17:46 ` [PATCH 3/6] of/of_i2c: add support for dedicated OF I2C devices Anton Vorontsov 2008-10-28 18:41 ` David Miller 2008-10-28 17:46 ` [PATCH 4/6] of/gpio: add support for two-stage registration for the of_gpio_chips Anton Vorontsov 2008-10-28 17:46 ` [PATCH 5/6] gpio/pca953x: pass gpio_chip pointer to the setup/teardown callbacks Anton Vorontsov 2008-10-28 17:46 ` [PATCH 6/6] gpio: OpenFirmware bindings for the pca953x Anton Vorontsov 2008-10-28 17:53 ` [PATCH 0/6 RFC] OF-glue devices for I2C/SPI (was: Re: [PATCH 4/7] gpiolib: implement dev_gpiochip_{add,remove} calls Grant Likely 2008-10-22 2:27 ` Benjamin Herrenschmidt 2008-10-16 17:13 ` [PATCH 5/7] of/gpio: implement of_dev_gpiochip_{add,remove} calls Anton Vorontsov 2008-10-17 20:25 ` David Brownell 2008-10-17 21:13 ` Anton Vorontsov 2008-10-16 17:13 ` [PATCH 6/7] gpio/pca953x: convert to dev_gpiochip_add and make it work with the OF Anton Vorontsov 2008-10-16 17:13 ` [PATCH 7/7] i2c/mcu_mpc8349emitx: convert to the new I2C/OF/GPIO infrastructure Anton Vorontsov 2008-10-17 16:07 ` [PATCH 0/7 RFC] Handle I2C GPIO controllers with the OF (was: pca9539 I2C gpio expander) Steven A. Falco
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=20081028174613.GB25349@oksana.dev.rtsoft.ru \ --to=avorontsov@ru.mvista.com \ --cc=benh@kernel.crashing.org \ --cc=davem@davemloft.net \ --cc=david-b@pacbell.net \ --cc=grant.likely@secretlab.ca \ --cc=linux-kernel@vger.kernel.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: linkBe 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).