On 12/10/2014 02:21 PM, Ricardo Ribalda Delgado wrote:
> This way we do not need to transverse the device tree manually and we
> support hot plugged devices.
>
> Also Implement remove callback so the driver can be unloaded
>
> Signed-off-by: Ricardo Ribalda Delgado <[email protected]>
> ---
>
> v2: Suggested by Alexandre Courbot <[email protected]>
>
> Merge convert to platform device and implement remove callback in one patch
>
> drivers/gpio/gpio-xilinx.c | 79
> ++++++++++++++++++++++++++++++++++------------
> 1 file changed, 59 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/gpio/gpio-xilinx.c b/drivers/gpio/gpio-xilinx.c
> index 9483950..f946d96 100644
> --- a/drivers/gpio/gpio-xilinx.c
> +++ b/drivers/gpio/gpio-xilinx.c
> @@ -51,6 +51,11 @@ struct xgpio_instance {
> u32 gpio_state;
> u32 gpio_dir;
> spinlock_t gpio_lock;
> + bool inited;
like before - you should document it.
I know it is not proper kernel-doc format but I think
you can simple create one more patch before 1/3
and fix kernel-doc format first and then do your changes.
btw: this kernel-doc fixup is in xilinx git repo.
> +};
> +
> +struct xgpio {
> + struct xgpio_instance port[2];
> };
>
> /**
> @@ -173,24 +178,57 @@ static void xgpio_save_regs(struct of_mm_gpio_chip
> *mm_gc)
> }
>
> /**
> + * xgpio_remove - Remove method for the GPIO device.
> + * @pdev: pointer to the platform device
> + *
> + * This function remove gpiochips and frees all the allocated resources.
> + */
> +static int xgpio_remove(struct platform_device *pdev)
> +{
> + struct xgpio *xgpio = platform_get_drvdata(pdev);
> + int i;
> +
> + for (i = 0; i < 2; i++) {
> + if (!xgpio->port[i].inited)
> + continue;
> + gpiochip_remove(&xgpio->port[i].mmchip.gc);
> +
> + if (i == 1)
> + xgpio->port[i].mmchip.regs -= XGPIO_CHANNEL_OFFSET;
> +
> + iounmap(xgpio->port[i].mmchip.regs);
> + kfree(xgpio->port[i].mmchip.gc.label);
> + }
> +
> + return 0;
> +}
> +
> +/**
> * xgpio_of_probe - Probe method for the GPIO device.
> - * @np: pointer to device tree node
> + * @pdev: pointer to the platform device
> *
> * This function probes the GPIO device in the device tree. It initializes
> the
> * driver data structure. It returns 0, if the driver is bound to the GPIO
> * device, or a negative value if there is an error.
> */
> -static int xgpio_of_probe(struct device_node *np)
> +static int xgpio_probe(struct platform_device *pdev)
> {
> + struct xgpio *xgpio;
> struct xgpio_instance *chip;
> int status = 0;
> + struct device_node *np = pdev->dev.of_node;
> const u32 *tree_info;
> u32 ngpio;
>
> - chip = kzalloc(sizeof(*chip), GFP_KERNEL);
> - if (!chip)
> + xgpio = (struct xgpio *) devm_kzalloc(&pdev->dev, sizeof(*xgpio),
> + GFP_KERNEL);
don't need to recast it here.
> + if (!xgpio)
> return -ENOMEM;
>
> + platform_set_drvdata(pdev, xgpio);
> +
> + chip = &xgpio->port[0];
> +
> /* Update GPIO state shadow register with default value */
> of_property_read_u32(np, "xlnx,dout-default", &chip->gpio_state);
>
> @@ -210,6 +248,7 @@ static int xgpio_of_probe(struct device_node *np)
>
> spin_lock_init(&chip->gpio_lock);
>
> + chip->mmchip.gc.dev = &pdev->dev;
> chip->mmchip.gc.direction_input = xgpio_dir_in;
> chip->mmchip.gc.direction_output = xgpio_dir_out;
> chip->mmchip.gc.get = xgpio_get;
> @@ -220,20 +259,18 @@ static int xgpio_of_probe(struct device_node *np)
> /* Call the OF gpio helper to setup and register the GPIO device */
> status = of_mm_gpiochip_add(np, &chip->mmchip);
> if (status) {
> - kfree(chip);
> pr_err("%s: error in probe function with status %d\n",
> np->full_name, status);
> return status;
> }
> + chip->inited = true;
>
> pr_info("XGpio: %s: registered, base is %d\n", np->full_name,
> chip->mmchip.gc.base);
>
> tree_info = of_get_property(np, "xlnx,is-dual", NULL);
> if (tree_info && be32_to_cpup(tree_info)) {
> - chip = kzalloc(sizeof(*chip), GFP_KERNEL);
> - if (!chip)
> - return -ENOMEM;
> + chip = &xgpio->port[1];
>
> /* Update GPIO state shadow register with default value */
> of_property_read_u32(np, "xlnx,dout-default-2",
> @@ -255,6 +292,7 @@ static int xgpio_of_probe(struct device_node *np)
>
> spin_lock_init(&chip->gpio_lock);
>
> + chip->mmchip.gc.dev = &pdev->dev;
> chip->mmchip.gc.direction_input = xgpio_dir_in;
> chip->mmchip.gc.direction_output = xgpio_dir_out;
> chip->mmchip.gc.get = xgpio_get;
> @@ -265,7 +303,7 @@ static int xgpio_of_probe(struct device_node *np)
> /* Call the OF gpio helper to setup and register the GPIO dev */
> status = of_mm_gpiochip_add(np, &chip->mmchip);
> if (status) {
> - kfree(chip);
> + xgpio_remove(pdev);
> pr_err("%s: error in probe function with status %d\n",
> np->full_name, status);
> return status;
> @@ -273,6 +311,7 @@ static int xgpio_of_probe(struct device_node *np)
>
> /* Add dual channel offset */
> chip->mmchip.regs += XGPIO_CHANNEL_OFFSET;
> + chip->inited = true;
>
> pr_info("XGpio: %s: dual channel registered, base is %d\n",
> np->full_name, chip->mmchip.gc.base);
> @@ -286,19 +325,19 @@ static const struct of_device_id xgpio_of_match[] = {
> { /* end of list */ },
> };
>
> -static int __init xgpio_init(void)
> -{
> - struct device_node *np;
> -
> - for_each_matching_node(np, xgpio_of_match)
> - xgpio_of_probe(np);
> +MODULE_DEVICE_TABLE(of, xgpio_of_match);
>
> - return 0;
> -}
> +static struct platform_driver xgpio_plat_driver = {
> + .probe = xgpio_probe,
> + .remove = xgpio_remove,
> + .driver = {
> + .name = "gpio-xilinx",
> + .owner = THIS_MODULE,
remove this line - it was the part of resent cleanup
> + .of_match_table = xgpio_of_match,
> + },
> +};
>
> -/* Make sure we get initialized before anyone else tries to use us */
> -subsys_initcall(xgpio_init);
> -/* No exit call at the moment as we cannot unregister of GPIO chips */
> +module_platform_driver(xgpio_plat_driver);
subsys is 4. module_platform is different level that's why you are changing
order here. You shouldn't do it. Just keep the same level because
some drivers can depend on it.
Thanks,
Michal
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
