[PATCH 0/2] Drop unused helpers from <linux/ata.h>

[PATCH 0/2] Drop unused helpers from <linux/ata.h>

[Sergey Shtylyov]

Here are 2 patches against the 'for-next' branch of Damien Le Moal's
'libata.git' repo.

All the functions moved from drivers/ide/ (with a rename) to <linux/ata.h>
by Bart Z. (back then drivers/ide/ maintainer) never saw any use except by
drivers/ide/ -- thus, when it was removed from the kernel, these functions
became unused; 3 of them have been dropped by Niklas Cassel, and now I am
dropping 2 remaining functions...

Sergey Shtylyov (2):
  ata: drop unused ata_id_to_hd_driveid()
  ata: drop unused ata_id_is_lba_capacity_ok()

 include/linux/ata.h | 71 ---------------------------------------------
 1 file changed, 71 deletions(-)

-- 
2.26.3

[PATCH 1/2] ata: drop unused ata_id_to_hd_driveid()

[Sergey Shtylyov]

This function was renamed from ide_id_to_hd_driveid() and moved from
drivers/ide/ to <linux/ata.h> but it never got used by libata, thus it
became useless after drivers/ide/ removal...

Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
---
 include/linux/ata.h | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/include/linux/ata.h b/include/linux/ata.h
index 0c18499f60b6..3240116647d5 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -16,7 +16,6 @@
 #include <linux/bits.h>
 #include <linux/string.h>
 #include <linux/types.h>
-#include <asm/byteorder.h>
 
 /* defines only for the constants which don't work well as enums */
 #define ATA_DMA_BOUNDARY	0xffffUL
@@ -1067,26 +1066,6 @@ static inline bool ata_id_is_lba_capacity_ok(u16 *id)
 	return false;	/* LBA capacity value may be bad */
 }
 
-static inline void ata_id_to_hd_driveid(u16 *id)
-{
-#ifdef __BIG_ENDIAN
-	/* accessed in struct hd_driveid as 8-bit values */
-	id[ATA_ID_MAX_MULTSECT]	 = __cpu_to_le16(id[ATA_ID_MAX_MULTSECT]);
-	id[ATA_ID_CAPABILITY]	 = __cpu_to_le16(id[ATA_ID_CAPABILITY]);
-	id[ATA_ID_OLD_PIO_MODES] = __cpu_to_le16(id[ATA_ID_OLD_PIO_MODES]);
-	id[ATA_ID_OLD_DMA_MODES] = __cpu_to_le16(id[ATA_ID_OLD_DMA_MODES]);
-	id[ATA_ID_MULTSECT]	 = __cpu_to_le16(id[ATA_ID_MULTSECT]);
-
-	/* as 32-bit values */
-	*(u32 *)&id[ATA_ID_LBA_CAPACITY] = ata_id_u32(id, ATA_ID_LBA_CAPACITY);
-	*(u32 *)&id[ATA_ID_SPG]		 = ata_id_u32(id, ATA_ID_SPG);
-
-	/* as 64-bit value */
-	*(u64 *)&id[ATA_ID_LBA_CAPACITY_2] =
-		ata_id_u64(id, ATA_ID_LBA_CAPACITY_2);
-#endif
-}
-
 static inline bool ata_ok(u8 status)
 {
 	return ((status & (ATA_BUSY | ATA_DRDY | ATA_DF | ATA_DRQ | ATA_ERR))
-- 
2.26.3

[PATCH 2/2] ata: drop unused ata_id_is_lba_capacity_ok()

[Sergey Shtylyov]

This function was renamed from lba_capacity_is_ok()() and moved from
drivers/ide/ to <linux/ata.h> but it never got used by libata, thus it
became useless after drivers/ide/ removal...

Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
---
 include/linux/ata.h | 50 ---------------------------------------------
 1 file changed, 50 deletions(-)

diff --git a/include/linux/ata.h b/include/linux/ata.h
index 3240116647d5..c224dbddb9b2 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -1016,56 +1016,6 @@ static inline bool atapi_id_dmadir(const u16 *dev_id)
 	return ata_id_major_version(dev_id) >= 7 && (dev_id[62] & 0x8000);
 }
 
-/*
- * ata_id_is_lba_capacity_ok() performs a sanity check on
- * the claimed LBA capacity value for the device.
- *
- * Returns 1 if LBA capacity looks sensible, 0 otherwise.
- *
- * It is called only once for each device.
- */
-static inline bool ata_id_is_lba_capacity_ok(u16 *id)
-{
-	unsigned long lba_sects, chs_sects, head, tail;
-
-	/* No non-LBA info .. so valid! */
-	if (id[ATA_ID_CYLS] == 0)
-		return true;
-
-	lba_sects = ata_id_u32(id, ATA_ID_LBA_CAPACITY);
-
-	/*
-	 * The ATA spec tells large drives to return
-	 * C/H/S = 16383/16/63 independent of their size.
-	 * Some drives can be jumpered to use 15 heads instead of 16.
-	 * Some drives can be jumpered to use 4092 cyls instead of 16383.
-	 */
-	if ((id[ATA_ID_CYLS] == 16383 ||
-	     (id[ATA_ID_CYLS] == 4092 && id[ATA_ID_CUR_CYLS] == 16383)) &&
-	    id[ATA_ID_SECTORS] == 63 &&
-	    (id[ATA_ID_HEADS] == 15 || id[ATA_ID_HEADS] == 16) &&
-	    (lba_sects >= 16383 * 63 * id[ATA_ID_HEADS]))
-		return true;
-
-	chs_sects = id[ATA_ID_CYLS] * id[ATA_ID_HEADS] * id[ATA_ID_SECTORS];
-
-	/* perform a rough sanity check on lba_sects: within 10% is OK */
-	if (lba_sects - chs_sects < chs_sects/10)
-		return true;
-
-	/* some drives have the word order reversed */
-	head = (lba_sects >> 16) & 0xffff;
-	tail = lba_sects & 0xffff;
-	lba_sects = head | (tail << 16);
-
-	if (lba_sects - chs_sects < chs_sects/10) {
-		*(__le32 *)&id[ATA_ID_LBA_CAPACITY] = __cpu_to_le32(lba_sects);
-		return true;	/* LBA capacity is (now) good */
-	}
-
-	return false;	/* LBA capacity value may be bad */
-}
-
 static inline bool ata_ok(u8 status)
 {
 	return ((status & (ATA_BUSY | ATA_DRDY | ATA_DF | ATA_DRQ | ATA_ERR))
-- 
2.26.3

Re: [PATCH 0/2] Drop unused helpers from <linux/ata.h>

[Damien Le Moal]

On 2/25/23 05:40, Sergey Shtylyov wrote:
> Here are 2 patches against the 'for-next' branch of Damien Le Moal's
> 'libata.git' repo.
> 
> All the functions moved from drivers/ide/ (with a rename) to <linux/ata.h>
> by Bart Z. (back then drivers/ide/ maintainer) never saw any use except by
> drivers/ide/ -- thus, when it was removed from the kernel, these functions
> became unused; 3 of them have been dropped by Niklas Cassel, and now I am
> dropping 2 remaining functions...
> 
> Sergey Shtylyov (2):
>   ata: drop unused ata_id_to_hd_driveid()
>   ata: drop unused ata_id_is_lba_capacity_ok()
> 
>  include/linux/ata.h | 71 ---------------------------------------------
>  1 file changed, 71 deletions(-)
> 

Applied to for-6.4. Thanks !

-- 
Damien Le Moal
Western Digital Research

Re: [PATCH 0/2] Drop unused helpers from <linux/ata.h>

[Sergey Shtylyov]

On 2/24/23 11:39 PM, Sergey Shtylyov wrote:

> Here are 2 patches against the 'for-next' branch of Damien Le Moal's
> 'libata.git' repo.
> 
> All the functions moved from drivers/ide/ (with a rename) to <linux/ata.h>
> by Bart Z. (back then drivers/ide/ maintainer) never saw any use except by
> drivers/ide/ -- thus, when it was removed from the kernel, these functions
> became unused; 3 of them have been dropped by Niklas Cassel, and now I am
> dropping 2 remaining functions...
> 
> Sergey Shtylyov (2):
>   ata: drop unused ata_id_to_hd_driveid()
>   ata: drop unused ata_id_is_lba_capacity_ok()
> 
>  include/linux/ata.h | 71 ---------------------------------------------
>  1 file changed, 71 deletions(-)

   Sorry for trying to send the same series twice, and ignore this one please.
I forgot how to run 'git send-email' again... :-/

MBR, Sergey

[PATCH 0/2] Drop unused helpers from <linux/ata.h>

[Sergey Shtylyov]

Here are 2 patches against the 'for-next' branch of Damien Le Moal's
'libata.git' repo.

All the functions moved from drivers/ide/ (with a rename) to <linux/ata.h>
by Bart Z. (back then drivers/ide/ maintainer) never saw any use except by
drivers/ide/ -- thus, when it was removed from the kernel, these functions
became unused; 3 of them have been dropped by Niklas Cassel, and now I am
dropping 2 remaining functions...

Sergey Shtylyov (2):
  ata: drop unused ata_id_to_hd_driveid()
  ata: drop unused ata_id_is_lba_capacity_ok()

 include/linux/ata.h | 71 ---------------------------------------------
 1 file changed, 71 deletions(-)

-- 
2.26.3