diff --git a/drivers/gpio/gpio_handlers.c b/drivers/gpio/gpio_handlers.c
index 625c1889e3d..8c3c7d20c07 100644
--- a/drivers/gpio/gpio_handlers.c
+++ b/drivers/gpio/gpio_handlers.c
@@ -29,20 +29,17 @@ Z_SYSCALL_HANDLER(gpio_read, port, access_op, pin, value)
 
 Z_SYSCALL_HANDLER(gpio_enable_callback, port, access_op, pin)
 {
-	Z_OOPS(Z_SYSCALL_DRIVER_GPIO(port, enable_callback));
 	return _impl_gpio_enable_callback((struct device *)port, access_op,
 					  pin);
 }
 
 Z_SYSCALL_HANDLER(gpio_disable_callback, port, access_op, pin)
 {
-	Z_OOPS(Z_SYSCALL_DRIVER_GPIO(port, disable_callback));
 	return _impl_gpio_disable_callback((struct device *)port, access_op,
 					   pin);
 }
 
 Z_SYSCALL_HANDLER(gpio_get_pending_int, port)
 {
-	Z_OOPS(Z_SYSCALL_DRIVER_GPIO(port, get_pending_int));
 	return _impl_gpio_get_pending_int((struct device *)port);
 }
diff --git a/include/gpio.h b/include/gpio.h
index f5ca16967aa..39526513cdf 100644
--- a/include/gpio.h
+++ b/include/gpio.h
@@ -169,6 +169,10 @@ static inline int _impl_gpio_enable_callback(struct device *port,
 	const struct gpio_driver_api *api =
 		(const struct gpio_driver_api *)port->driver_api;
 
+	if (!api->enable_callback) {
+		return -ENOTSUP;
+	}
+
 	return api->enable_callback(port, access_op, pin);
 }
 
@@ -181,6 +185,10 @@ static inline int _impl_gpio_disable_callback(struct device *port,
 	const struct gpio_driver_api *api =
 		(const struct gpio_driver_api *)port->driver_api;
 
+	if (!api->disable_callback) {
+		return -ENOTSUP;
+	}
+
 	return api->disable_callback(port, access_op, pin);
 }
 /**
@@ -260,7 +268,9 @@ static inline int gpio_add_callback(struct device *port,
 	const struct gpio_driver_api *api =
 		(const struct gpio_driver_api *)port->driver_api;
 
-	__ASSERT(callback, "Callback pointer should not be NULL");
+	if (!api->manage_callback) {
+		return -ENOTSUP;
+	}
 
 	return api->manage_callback(port, callback, true);
 }
@@ -280,7 +290,9 @@ static inline int gpio_remove_callback(struct device *port,
 	const struct gpio_driver_api *api =
 		(const struct gpio_driver_api *)port->driver_api;
 
-	__ASSERT(callback, "Callback pointer should not be NULL");
+	if (!api->manage_callback) {
+		return -ENOTSUP;
+	}
 
 	return api->manage_callback(port, callback, false);
 }
@@ -405,9 +417,13 @@ __syscall int gpio_get_pending_int(struct device *dev);
  */
 static inline int _impl_gpio_get_pending_int(struct device *dev)
 {
-	struct gpio_driver_api *api;
+	const struct gpio_driver_api *api =
+		(const struct gpio_driver_api *)dev->driver_api;
+
+	if (!api->get_pending_int) {
+		return -ENOTSUP;
+	}
 
-	api = (struct gpio_driver_api *)dev->driver_api;
 	return api->get_pending_int(dev);
 }