Index: head/sys/cam/ata/ata_da.c
===================================================================
--- head/sys/cam/ata/ata_da.c
+++ head/sys/cam/ata/ata_da.c
@@ -466,14 +466,6 @@
 	},
 	{
 		/*
-		 * Samsung 843T Series SSDs
-		 * 4k optimised
-		 */
-		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "SAMSUNG MZ7WD*", "*" },
-		/*quirks*/ADA_Q_4K
-	},
- 	{
- 		/*
 		 * Samsung 850 SSDs
 		 * 4k optimised
 		 */
@@ -482,18 +474,13 @@
 	},
 	{
 		/*
-		 * Samsung PM853T Series SSDs
-		 * 4k optimised
-		 */
-		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "SAMSUNG MZ7GE*", "*" },
-		/*quirks*/ADA_Q_4K
-	},
-	{
-		/*
-		 * Samsung SM863 Series SSDs
+		 * Samsung 843T Series SSDs (MZ7WD*)
+		 * Samsung PM851 Series SSDs (MZ7TE*)
+		 * Samsung PM853T Series SSDs (MZ7GE*)
+		 * Samsung SM863 Series SSDs (MZ7KM*)
 		 * 4k optimised
 		 */
-		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "SAMSUNG MZ7KM*", "*" },
+		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "SAMSUNG MZ7*", "*" },
 		/*quirks*/ADA_Q_4K
 	},
 	{
Index: head/sys/cam/scsi/scsi_da.c
===================================================================
--- head/sys/cam/scsi/scsi_da.c
+++ head/sys/cam/scsi/scsi_da.c
@@ -1138,14 +1138,6 @@
 	},
 	{
 		/*
-		 * Samsung 843T Series SSDs
-		 * 4k optimised
-		 */
-		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "SAMSUNG MZ7WD*", "*" },
-		/*quirks*/DA_Q_4K
-	},
- 	{
- 		/*
 		 * Samsung 850 SSDs
 		 * 4k optimised & trim only works in 4k requests + 4k aligned
 		 */
@@ -1154,18 +1146,13 @@
 	},
 	{
 		/*
-		 * Samsung PM853T Series SSDs
-		 * 4k optimised
-		 */
-		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "SAMSUNG MZ7GE*", "*" },
-		/*quirks*/DA_Q_4K
-	},
-	{
-		/*
-		 * Samsung SM863 Series SSDs
+		 * Samsung 843T Series SSDs (MZ7WD*)
+		 * Samsung PM851 Series SSDs (MZ7TE*)
+		 * Samsung PM853T Series SSDs (MZ7GE*)
+		 * Samsung SM863 Series SSDs (MZ7KM*)
 		 * 4k optimised
 		 */
-		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "SAMSUNG MZ7KM*", "*" },
+		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "SAMSUNG MZ7*", "*" },
 		/*quirks*/DA_Q_4K
 	},
 	{