| Message ID | 20230112163951.73180-1-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v1,1/1] gpio: xilinx: Remove duplicate assignment of of_gpio_n_cells | expand |
On Thu, Jan 12, 2023 at 5:39 PM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > > The of_gpio_n_cells default is 2 when ->of_xlate() callback is > not defined. No need to assign it explicitly in the driver. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > drivers/gpio/gpio-xilinx.c | 11 ----------- > 1 file changed, 11 deletions(-) > > diff --git a/drivers/gpio/gpio-xilinx.c b/drivers/gpio/gpio-xilinx.c > index 619a00ad71d4..bbcde91135b9 100644 > --- a/drivers/gpio/gpio-xilinx.c > +++ b/drivers/gpio/gpio-xilinx.c > @@ -558,7 +558,6 @@ static int xgpio_probe(struct platform_device *pdev) > int status = 0; > struct device_node *np = pdev->dev.of_node; > u32 is_dual = 0; > - u32 cells = 2; > u32 width[2]; > u32 state[2]; > u32 dir[2]; > @@ -591,15 +590,6 @@ static int xgpio_probe(struct platform_device *pdev) > > bitmap_from_arr32(chip->dir, dir, 64); > > - /* Update cells with gpio-cells value */ > - if (of_property_read_u32(np, "#gpio-cells", &cells)) > - dev_dbg(&pdev->dev, "Missing gpio-cells property\n"); > - > - if (cells != 2) { > - dev_err(&pdev->dev, "#gpio-cells mismatch\n"); > - return -EINVAL; > - } > - > /* > * Check device node and parent device node for device width > * and assume default width of 32 > @@ -630,7 +620,6 @@ static int xgpio_probe(struct platform_device *pdev) > chip->gc.parent = &pdev->dev; > chip->gc.direction_input = xgpio_dir_in; > chip->gc.direction_output = xgpio_dir_out; > - chip->gc.of_gpio_n_cells = cells; > chip->gc.get = xgpio_get; > chip->gc.set = xgpio_set; > chip->gc.request = xgpio_request; > -- > 2.39.0 > Applied, thanks! Bart
diff --git a/drivers/gpio/gpio-xilinx.c b/drivers/gpio/gpio-xilinx.c index 619a00ad71d4..bbcde91135b9 100644 --- a/drivers/gpio/gpio-xilinx.c +++ b/drivers/gpio/gpio-xilinx.c @@ -558,7 +558,6 @@ static int xgpio_probe(struct platform_device *pdev) int status = 0; struct device_node *np = pdev->dev.of_node; u32 is_dual = 0; - u32 cells = 2; u32 width[2]; u32 state[2]; u32 dir[2]; @@ -591,15 +590,6 @@ static int xgpio_probe(struct platform_device *pdev) bitmap_from_arr32(chip->dir, dir, 64); - /* Update cells with gpio-cells value */ - if (of_property_read_u32(np, "#gpio-cells", &cells)) - dev_dbg(&pdev->dev, "Missing gpio-cells property\n"); - - if (cells != 2) { - dev_err(&pdev->dev, "#gpio-cells mismatch\n"); - return -EINVAL; - } - /* * Check device node and parent device node for device width * and assume default width of 32 @@ -630,7 +620,6 @@ static int xgpio_probe(struct platform_device *pdev) chip->gc.parent = &pdev->dev; chip->gc.direction_input = xgpio_dir_in; chip->gc.direction_output = xgpio_dir_out; - chip->gc.of_gpio_n_cells = cells; chip->gc.get = xgpio_get; chip->gc.set = xgpio_set; chip->gc.request = xgpio_request;
The of_gpio_n_cells default is 2 when ->of_xlate() callback is not defined. No need to assign it explicitly in the driver. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/gpio/gpio-xilinx.c | 11 ----------- 1 file changed, 11 deletions(-)