Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 05:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

w1-gpio: Simplify & get rid of defines

Browse Source 
There's no reason to have the OF defines; it complicates the driver.
There's also no need for the funky platform_driver_probe.

Add a few warnings in case there's a failure; helps us find out
what went wrong.

Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
Signed-off-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Pantelis Antoniou 2012-11-22 01:13:47 +04:00 committed by Greg Kroah-Hartman
parent 277ed0d542
commit 8a1861d997
1 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
drivers/w1/masters/w1-gpio.c
View File

@ -18,6 +18,7 @@
#include <linux/of_gpio.h> #include <linux/of_gpio.h>
#include <linux/pinctrl/consumer.h> #include <linux/pinctrl/consumer.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/of.h>
#include "../w1.h" #include "../w1.h"
#include "../w1_int.h" #include "../w1_int.h"
@ -46,7 +47,6 @@ static u8 w1_gpio_read_bit(void *data)
return gpio_get_value(pdata->pin) ? 1 : 0; return gpio_get_value(pdata->pin) ? 1 : 0;
} }
#ifdef CONFIG_OF
static struct of_device_id w1_gpio_dt_ids[] = { static struct of_device_id w1_gpio_dt_ids[] = {
{ .compatible = "w1-gpio" }, { .compatible = "w1-gpio" },
{} {}
@ -57,11 +57,6 @@ static int w1_gpio_probe_dt(struct platform_device *pdev)
{ {
struct w1_gpio_platform_data *pdata = pdev->dev.platform_data; struct w1_gpio_platform_data *pdata = pdev->dev.platform_data;
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
const struct of_device_id *of_id =
of_match_device(w1_gpio_dt_ids, &pdev->dev);
if (!of_id)
return 0;
pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
if (!pdata) if (!pdata)
@ -76,12 +71,6 @@ static int w1_gpio_probe_dt(struct platform_device *pdev)
return 0; return 0;
} }
#else
static int w1_gpio_probe_dt(struct platform_device *pdev)
{
return 0;
}
#endif
static int __init w1_gpio_probe(struct platform_device *pdev) static int __init w1_gpio_probe(struct platform_device *pdev)
{ {
@ -94,29 +83,42 @@ static int __init w1_gpio_probe(struct platform_device *pdev)
if (IS_ERR(pinctrl)) if (IS_ERR(pinctrl))
dev_warn(&pdev->dev, "unable to select pin group\n"); dev_warn(&pdev->dev, "unable to select pin group\n");
if (of_have_populated_dt()) {
err = w1_gpio_probe_dt(pdev); err = w1_gpio_probe_dt(pdev);
if (err < 0) if (err < 0) {
dev_err(&pdev->dev, "Failed to parse DT\n");
return err; return err;
}
}
pdata = pdev->dev.platform_data; pdata = pdev->dev.platform_data;
if (!pdata) if (!pdata) {
dev_err(&pdev->dev, "No configuration data\n");
return -ENXIO; return -ENXIO;
}
master = kzalloc(sizeof(struct w1_bus_master), GFP_KERNEL); master = kzalloc(sizeof(struct w1_bus_master), GFP_KERNEL);
if (!master) if (!master) {
dev_err(&pdev->dev, "Out of memory\n");
return -ENOMEM; return -ENOMEM;
}
err = gpio_request(pdata->pin, "w1"); err = gpio_request(pdata->pin, "w1");
if (err) if (err) {
dev_err(&pdev->dev, "gpio_request (pin) failed\n");
goto free_master; goto free_master;
}
if (gpio_is_valid(pdata->ext_pullup_enable_pin)) { if (gpio_is_valid(pdata->ext_pullup_enable_pin)) {
err = gpio_request_one(pdata->ext_pullup_enable_pin, err = gpio_request_one(pdata->ext_pullup_enable_pin,
GPIOF_INIT_LOW, "w1 pullup"); GPIOF_INIT_LOW, "w1 pullup");
if (err < 0) if (err < 0) {
dev_err(&pdev->dev, "gpio_request_one "
"(ext_pullup_enable_pin) failed\n");
goto free_gpio; goto free_gpio;
} }
}
master->data = pdata; master->data = pdata;
master->read_bit = w1_gpio_read_bit; master->read_bit = w1_gpio_read_bit;
@ -130,8 +132,10 @@ static int __init w1_gpio_probe(struct platform_device *pdev)
} }
err = w1_add_master_device(master); err = w1_add_master_device(master);
if (err) if (err) {
dev_err(&pdev->dev, "w1_add_master device failed\n");
goto free_gpio_ext_pu; goto free_gpio_ext_pu;
}
if (pdata->enable_external_pullup) if (pdata->enable_external_pullup)
pdata->enable_external_pullup(1); pdata->enable_external_pullup(1);
@ -205,23 +209,13 @@ static struct platform_driver w1_gpio_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.of_match_table = of_match_ptr(w1_gpio_dt_ids), .of_match_table = of_match_ptr(w1_gpio_dt_ids),
}, },
.probe = w1_gpio_probe,
.remove = __exit_p(w1_gpio_remove), .remove = __exit_p(w1_gpio_remove),
.suspend = w1_gpio_suspend, .suspend = w1_gpio_suspend,
.resume = w1_gpio_resume, .resume = w1_gpio_resume,
}; };
static int __init w1_gpio_init(void) module_platform_driver(w1_gpio_driver);
{
return platform_driver_probe(&w1_gpio_driver, w1_gpio_probe);
}
static void __exit w1_gpio_exit(void)
{
platform_driver_unregister(&w1_gpio_driver);
}
module_init(w1_gpio_init);
module_exit(w1_gpio_exit);
MODULE_DESCRIPTION("GPIO w1 bus master driver"); MODULE_DESCRIPTION("GPIO w1 bus master driver");
MODULE_AUTHOR("Ville Syrjala <syrjala@sci.fi>"); MODULE_AUTHOR("Ville Syrjala <syrjala@sci.fi>");