Commit b94cf35d authored by Thomas Richard's avatar Thomas Richard Committed by Bartosz Golaszewski
Browse files

gpio: aggregator: update gpiochip_fwd_setup_delay_line() parameters

parent 10d022ef
Loading
Loading
Loading
Loading
+6 −9
Original line number Diff line number Diff line
@@ -453,10 +453,11 @@ static int gpiochip_fwd_delay_of_xlate(struct gpio_chip *chip,
	return line;
}

static int gpiochip_fwd_setup_delay_line(struct device *dev, struct gpio_chip *chip,
					 struct gpiochip_fwd *fwd)
static int gpiochip_fwd_setup_delay_line(struct gpiochip_fwd *fwd)
{
	fwd->delay_timings = devm_kcalloc(dev, chip->ngpio,
	struct gpio_chip *chip = &fwd->chip;

	fwd->delay_timings = devm_kcalloc(chip->parent, chip->ngpio,
					  sizeof(*fwd->delay_timings),
					  GFP_KERNEL);
	if (!fwd->delay_timings)
@@ -468,8 +469,7 @@ static int gpiochip_fwd_setup_delay_line(struct device *dev, struct gpio_chip *c
	return 0;
}
#else
static int gpiochip_fwd_setup_delay_line(struct device *dev, struct gpio_chip *chip,
					 struct gpiochip_fwd *fwd)
static int gpiochip_fwd_setup_delay_line(struct gpiochip_fwd *fwd)
{
	return 0;
}
@@ -571,7 +571,6 @@ static struct gpiochip_fwd *gpiochip_fwd_create(struct device *dev,
						unsigned long features)
{
	struct gpiochip_fwd *fwd;
	struct gpio_chip *chip;
	unsigned int i;
	int error;

@@ -579,8 +578,6 @@ static struct gpiochip_fwd *gpiochip_fwd_create(struct device *dev,
	if (IS_ERR(fwd))
		return fwd;

	chip = &fwd->chip;

	for (i = 0; i < ngpios; i++) {
		error = gpiochip_fwd_desc_add(fwd, descs[i], i);
		if (error)
@@ -588,7 +585,7 @@ static struct gpiochip_fwd *gpiochip_fwd_create(struct device *dev,
	}

	if (features & FWD_FEATURE_DELAY) {
		error = gpiochip_fwd_setup_delay_line(dev, chip, fwd);
		error = gpiochip_fwd_setup_delay_line(fwd);
		if (error)
			return ERR_PTR(error);
	}