diff options
author | Tom Yan <tom.ty89@gmail.com> | 2016-07-12 14:54:12 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2016-07-12 14:58:46 -0400 |
commit | f086b7489a4ced0067ed39766146b60ff1fe4b9d (patch) | |
tree | 1d5bd8530aa2ab73de2628bf998ea3e506c9970d /drivers/ata | |
parent | c9cd3504eb03755db8e64f894ccd4ebee59734b7 (diff) |
libata-scsi: rename ata_msense_ctl_mode() to ata_msense_control()
To make it consistent with the recently added ata_mselect_control().
We probably shouldn't have the word "mode" in its name anyway, since
that's not the case for other ata_msense_*() / ata_mselect_*() either.
Signed-off-by: Tom Yan <tom.ty89@gmail.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r-- | drivers/ata/libata-scsi.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 9c7c9f28ac23..f0593bc2f97d 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c | |||
@@ -2437,7 +2437,7 @@ static unsigned int ata_msense_caching(u16 *id, u8 *buf, bool changeable) | |||
2437 | } | 2437 | } |
2438 | 2438 | ||
2439 | /** | 2439 | /** |
2440 | * ata_msense_ctl_mode - Simulate MODE SENSE control mode page | 2440 | * ata_msense_control - Simulate MODE SENSE control mode page |
2441 | * @dev: ATA device of interest | 2441 | * @dev: ATA device of interest |
2442 | * @buf: output buffer | 2442 | * @buf: output buffer |
2443 | * @changeable: whether changeable parameters are requested | 2443 | * @changeable: whether changeable parameters are requested |
@@ -2447,7 +2447,7 @@ static unsigned int ata_msense_caching(u16 *id, u8 *buf, bool changeable) | |||
2447 | * LOCKING: | 2447 | * LOCKING: |
2448 | * None. | 2448 | * None. |
2449 | */ | 2449 | */ |
2450 | static unsigned int ata_msense_ctl_mode(struct ata_device *dev, u8 *buf, | 2450 | static unsigned int ata_msense_control(struct ata_device *dev, u8 *buf, |
2451 | bool changeable) | 2451 | bool changeable) |
2452 | { | 2452 | { |
2453 | modecpy(buf, def_control_mpage, sizeof(def_control_mpage), changeable); | 2453 | modecpy(buf, def_control_mpage, sizeof(def_control_mpage), changeable); |
@@ -2571,13 +2571,13 @@ static unsigned int ata_scsiop_mode_sense(struct ata_scsi_args *args, u8 *rbuf) | |||
2571 | break; | 2571 | break; |
2572 | 2572 | ||
2573 | case CONTROL_MPAGE: | 2573 | case CONTROL_MPAGE: |
2574 | p += ata_msense_ctl_mode(args->dev, p, page_control == 1); | 2574 | p += ata_msense_control(args->dev, p, page_control == 1); |
2575 | break; | 2575 | break; |
2576 | 2576 | ||
2577 | case ALL_MPAGES: | 2577 | case ALL_MPAGES: |
2578 | p += ata_msense_rw_recovery(p, page_control == 1); | 2578 | p += ata_msense_rw_recovery(p, page_control == 1); |
2579 | p += ata_msense_caching(args->id, p, page_control == 1); | 2579 | p += ata_msense_caching(args->id, p, page_control == 1); |
2580 | p += ata_msense_ctl_mode(args->dev, p, page_control == 1); | 2580 | p += ata_msense_control(args->dev, p, page_control == 1); |
2581 | break; | 2581 | break; |
2582 | 2582 | ||
2583 | default: /* invalid page code */ | 2583 | default: /* invalid page code */ |
@@ -3672,7 +3672,7 @@ static int ata_mselect_control(struct ata_queued_cmd *qc, | |||
3672 | /* | 3672 | /* |
3673 | * Check that read-only bits are not modified. | 3673 | * Check that read-only bits are not modified. |
3674 | */ | 3674 | */ |
3675 | ata_msense_ctl_mode(dev, mpage, false); | 3675 | ata_msense_control(dev, mpage, false); |
3676 | for (i = 0; i < CONTROL_MPAGE_LEN - 2; i++) { | 3676 | for (i = 0; i < CONTROL_MPAGE_LEN - 2; i++) { |
3677 | if (i == 0) | 3677 | if (i == 0) |
3678 | continue; | 3678 | continue; |