Skip to content

Commit 10e8076

Browse files
committed
ata: libata: Rename ata_eh_read_sense_success_ncq_log()
The function ata_eh_read_sense_success_ncq_log() does more that just reading the sense data for successful NCQ commands log page as it also sets the sense data for all commands listed in the log page. Rename this function to ata_eh_get_ncq_success_sense() to better describe what the function does. Furthermore, since this function is only called from ata_eh_get_success_sense() in libata-eh.c, there is no need to export it and its declaration can be moved to drivers/ata/libata.h. To be consistent with this change, the function ata_eh_read_sense_success_non_ncq() is also renamed to ata_eh_get_non_ncq_success_sense(). Signed-off-by: Damien Le Moal <[email protected]> Reviewed-by: Niklas Cassel <[email protected]> Reviewed-by: Hannes Reinecke <[email protected]>
1 parent 78f76b0 commit 10e8076

File tree

4 files changed

+11
-12
lines changed

4 files changed

+11
-12
lines changed

drivers/ata/libata-eh.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1962,7 +1962,7 @@ static inline bool ata_eh_quiet(struct ata_queued_cmd *qc)
19621962
return qc->flags & ATA_QCFLAG_QUIET;
19631963
}
19641964

1965-
static int ata_eh_read_sense_success_non_ncq(struct ata_link *link)
1965+
static int ata_eh_get_non_ncq_success_sense(struct ata_link *link)
19661966
{
19671967
struct ata_port *ap = link->ap;
19681968
struct ata_queued_cmd *qc;
@@ -2013,9 +2013,9 @@ static void ata_eh_get_success_sense(struct ata_link *link)
20132013
* request sense ext command to retrieve the sense data.
20142014
*/
20152015
if (link->sactive)
2016-
ret = ata_eh_read_sense_success_ncq_log(link);
2016+
ret = ata_eh_get_ncq_success_sense(link);
20172017
else
2018-
ret = ata_eh_read_sense_success_non_ncq(link);
2018+
ret = ata_eh_get_non_ncq_success_sense(link);
20192019
if (ret)
20202020
goto out;
20212021

drivers/ata/libata-sata.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1487,8 +1487,8 @@ static int ata_eh_read_log_10h(struct ata_device *dev,
14871487
}
14881488

14891489
/**
1490-
* ata_eh_read_sense_success_ncq_log - Read the sense data for successful
1491-
* NCQ commands log
1490+
* ata_eh_get_ncq_success_sense - Read and process the sense data for
1491+
* successful NCQ commands log page
14921492
* @link: ATA link to get sense data for
14931493
*
14941494
* Read the sense data for successful NCQ commands log page to obtain
@@ -1501,7 +1501,7 @@ static int ata_eh_read_log_10h(struct ata_device *dev,
15011501
* RETURNS:
15021502
* 0 on success, -errno otherwise.
15031503
*/
1504-
int ata_eh_read_sense_success_ncq_log(struct ata_link *link)
1504+
int ata_eh_get_ncq_success_sense(struct ata_link *link)
15051505
{
15061506
struct ata_device *dev = link->device;
15071507
struct ata_port *ap = dev->link->ap;
@@ -1571,7 +1571,6 @@ int ata_eh_read_sense_success_ncq_log(struct ata_link *link)
15711571

15721572
return ret;
15731573
}
1574-
EXPORT_SYMBOL_GPL(ata_eh_read_sense_success_ncq_log);
15751574

15761575
/**
15771576
* ata_eh_analyze_ncq_error - analyze NCQ error

drivers/ata/libata.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,16 @@ extern unsigned int ata_read_log_page(struct ata_device *dev, u8 log,
9595
/* libata-sata.c */
9696
#ifdef CONFIG_SATA_HOST
9797
int sata_down_spd_limit(struct ata_link *link, u32 spd_limit);
98+
int ata_eh_get_ncq_success_sense(struct ata_link *link);
9899
#else
99100
static inline int sata_down_spd_limit(struct ata_link *link, u32 spd_limit)
100101
{
101102
return -EOPNOTSUPP;
102103
}
104+
static inline int ata_eh_get_ncq_success_sense(struct ata_link *link)
105+
{
106+
return -EOPNOTSUPP;
107+
}
103108
#endif
104109

105110
/* libata-acpi.c */

include/linux/libata.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1234,7 +1234,6 @@ extern int sata_link_hardreset(struct ata_link *link,
12341234
bool *online, int (*check_ready)(struct ata_link *));
12351235
extern int sata_link_resume(struct ata_link *link, const unsigned int *params,
12361236
unsigned long deadline);
1237-
extern int ata_eh_read_sense_success_ncq_log(struct ata_link *link);
12381237
extern void ata_eh_analyze_ncq_error(struct ata_link *link);
12391238
#else
12401239
static inline const unsigned int *
@@ -1277,10 +1276,6 @@ static inline int sata_link_resume(struct ata_link *link,
12771276
{
12781277
return -EOPNOTSUPP;
12791278
}
1280-
static inline int ata_eh_read_sense_success_ncq_log(struct ata_link *link)
1281-
{
1282-
return -EOPNOTSUPP;
1283-
}
12841279
static inline void ata_eh_analyze_ncq_error(struct ata_link *link) { }
12851280
#endif
12861281
extern int sata_link_debounce(struct ata_link *link,

0 commit comments

Comments
 (0)