From 9ae23c37e6da5077d0e8fe0dbd4a2b33176b89b3 Mon Sep 17 00:00:00 2001 From: Andriy Voskoboinyk Date: Thu, 21 Feb 2019 09:54:57 +0000 Subject: [PATCH] MFC r344198: GC ATA_REQUEST_TIMEOUT option remnants It was removed from code in r249083 and from sys/conf/options in r249213. PR: 193935, 222170 --- sys/conf/NOTES | 3 --- sys/dev/ata/ata-all.h | 4 ---- 2 files changed, 7 deletions(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 21fe8ab28f59..b48b35d1b120 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1765,11 +1765,8 @@ hint.ata.1.irq="15" # # ATA_STATIC_ID: controller numbering is static ie depends on location # else the device numbers are dynamically allocated. -# ATA_REQUEST_TIMEOUT: the number of seconds to wait for an ATA request -# before timing out. options ATA_STATIC_ID -#options ATA_REQUEST_TIMEOUT=10 # # Standard floppy disk controllers and floppy tapes, supports diff --git a/sys/dev/ata/ata-all.h b/sys/dev/ata/ata-all.h index cf8ed784e7b8..d2b257985024 100644 --- a/sys/dev/ata/ata-all.h +++ b/sys/dev/ata/ata-all.h @@ -207,10 +207,6 @@ #define ATA_OP_FINISHED 1 #define ATA_MAX_28BIT_LBA 268435455UL -#ifndef ATA_REQUEST_TIMEOUT -#define ATA_REQUEST_TIMEOUT 10 -#endif - /* structure used for composite atomic operations */ #define MAX_COMPOSITES 32 /* u_int32_t bits */ struct ata_composite {