diff --git a/drivers/pwm/pwm-gpio.c b/drivers/pwm/pwm-gpio.c
index ab421fb4b8ba37..6707a5dbe5fb13 100644
--- a/drivers/pwm/pwm-gpio.c
+++ b/drivers/pwm/pwm-gpio.c
@@ -229,7 +229,9 @@ static int gpio_pwm_remove(struct platform_device *pdev)
 		hrtimer_cancel(&gpio_data->timer);
 	}
 
-	return pwmchip_remove(&gpio_chip->chip);
+	pwmchip_remove(&gpio_chip->chip);
+
+	return 0;
 }
 
 static const struct of_device_id gpio_pwm_of_match[] = {