3 files changed, 11 insertions, 10 deletions

diff --git a/core/divelist.c b/core/divelist.c
index 4659261cd..3ce2d4704 100644
--- a/core/divelist.c
+++ b/core/divelist.c
@@ -19,7 +19,8 @@
  * void insert_trip(dive_trip_t *dive_trip_p)
  * void unregister_trip(dive_trip_t *trip)
  * void free_trip(dive_trip_t *trip)
- * void remove_dive_from_trip(struct dive *dive, bool was_autogen)
+ * void remove_dive_from_trip(struct dive *dive)
+ * struct dive_trip *unregister_dive_from_trip(struct dive *dive)
  * void add_dive_to_trip(struct dive *dive, dive_trip_t *trip)
  * dive_trip_t *create_and_hookup_trip_from_dive(struct dive *dive)
  * dive_trip_t *get_dives_to_autogroup(int start, int *from, int *to, bool *allocated)
@@ -884,7 +885,7 @@ static void unregister_dive_from_table(struct dive_table *table, int idx)
  * trip if this was the last dive in the trip. the caller is responsible
  * for removing the trip, if the trip->dives.nr went to 0.
  */
-struct dive_trip *unregister_dive_from_trip(struct dive *dive, short was_autogen)
+struct dive_trip *unregister_dive_from_trip(struct dive *dive)
 {
 	dive_trip_t *trip = dive->divetrip;
 	int idx;
@@ -899,9 +900,9 @@ struct dive_trip *unregister_dive_from_trip(struct dive *dive, short was_autogen
 	return trip;
 }
 
-void remove_dive_from_trip(struct dive *dive, short was_autogen)
+void remove_dive_from_trip(struct dive *dive)
 {
-	struct dive_trip *trip = unregister_dive_from_trip(dive, was_autogen);
+	struct dive_trip *trip = unregister_dive_from_trip(dive);
 	if (trip && trip->dives.nr == 0)
 		delete_trip(trip);
 }
@@ -1097,7 +1098,7 @@ void delete_single_dive(int idx)
 		return; /* this should never happen */
 	if (dive->selected)
 		deselect_dive(dive);
-	remove_dive_from_trip(dive, false);
+	remove_dive_from_trip(dive);
 	delete_dive_from_table(&dive_table, idx);
 }
 
@@ -1406,9 +1407,9 @@ static bool try_to_merge_into(struct dive *dive_to_add, int idx, bool prefer_imp
 	merged->selected = old_dive->selected;
 	dive_table.dives[idx] = merged;
 	if (trip)
-		remove_dive_from_trip(old_dive, false);
+		remove_dive_from_trip(old_dive);
 	free_dive(old_dive);
-	remove_dive_from_trip(dive_to_add, false);
+	remove_dive_from_trip(dive_to_add);
 	free_dive(dive_to_add);
 
 	return true;
diff --git a/core/divelist.h b/core/divelist.h
index ce4943660..d926886b6 100644
--- a/core/divelist.h
+++ b/core/divelist.h
@@ -28,8 +28,8 @@ extern void add_single_dive(int idx, struct dive *dive);
 extern void get_dive_gas(const struct dive *dive, int *o2_p, int *he_p, int *o2low_p);
 extern int get_divenr(const struct dive *dive);
 extern int get_divesite_idx(const struct dive_site *ds);
-extern struct dive_trip *unregister_dive_from_trip(struct dive *dive, short was_autogen);
-extern void remove_dive_from_trip(struct dive *dive, short was_autogen);
+extern struct dive_trip *unregister_dive_from_trip(struct dive *dive);
+extern void remove_dive_from_trip(struct dive *dive);
 extern dive_trip_t *alloc_trip(void);
 extern dive_trip_t *create_trip_from_dive(struct dive *dive);
 extern dive_trip_t *create_and_hookup_trip_from_dive(struct dive *dive);
diff --git a/core/uemis-downloader.c b/core/uemis-downloader.c
index 3ae6f7b8d..0e7ed1f8b 100644
--- a/core/uemis-downloader.c
+++ b/core/uemis-downloader.c
@@ -859,7 +859,7 @@ static bool uemis_delete_dive(device_data_t *devdata, uint32_t diveid)
 	if (dive) {
 		devdata->download_table->dives[--devdata->download_table->nr] = NULL;
 		if (dive->notrip)
-			remove_dive_from_trip(dive, false);
+			remove_dive_from_trip(dive);
 
 		free(dive->dc.sample);
 		free((void *)dive->notes);