From patchwork Tue Jul 12 18:54:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Yan X-Patchwork-Id: 9225953 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6F2B560868 for ; Tue, 12 Jul 2016 18:54:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5548627813 for ; Tue, 12 Jul 2016 18:54:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3688E27CCB; Tue, 12 Jul 2016 18:54:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C6AC527813 for ; Tue, 12 Jul 2016 18:54:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750843AbcGLSyz (ORCPT ); Tue, 12 Jul 2016 14:54:55 -0400 Received: from mail-pa0-f68.google.com ([209.85.220.68]:34845 "EHLO mail-pa0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750744AbcGLSyy (ORCPT ); Tue, 12 Jul 2016 14:54:54 -0400 Received: by mail-pa0-f68.google.com with SMTP id dx3so1547034pab.2; Tue, 12 Jul 2016 11:54:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:from:to:cc:subject:date:in-reply-to:references; bh=zsr0B5aW2B7dD8sci4e5sDHSebZ2nuGynOOpH99ppNc=; b=yLDIiOq4qzE3jQC0FLGj3I5R62cM8/ScOKirr/kzB2s+PPCB/5NX1LbNsOLh6T6ShI PfhDCS0kjUffBjTG4VYDy7TCfdCuUsj4HIRoBu+3QiC+rnq3VZkMuaGgyeB1MlMtxJOh cnP8LsRlVrEeVVmOnCXcHBCfubCbnP960cBAQlRQ7bDYDYYQPozs8+sWPJv0tAYv/ruu sNQ3hSSo/5TyBhuZ1ZF/gF9ts7oHxUnN2EowDCzcia5tbNtaUNfy46UG8HdDU9rugI3l hiOf75QhvCiMNPwVuJ2IvxuD6spPg0WRd8ucHY1m1O/iGdlHQQmPkedKZpJUvcSCDX1f QOXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:from:to:cc:subject:date:in-reply-to :references; bh=zsr0B5aW2B7dD8sci4e5sDHSebZ2nuGynOOpH99ppNc=; b=iQgQhifQuU1xx9j1JGgBm+/rjVUn7VDKc6H09fzEz6yLrg1E/lPc/2MXx0E7Dpc5mw cYk7rcWjm67ZvIHmpumlB2u0CNHHl3WkCZZNLqkVFzkTM9l+3WDmMFrQRRcuGIQGCc3z KXCG9YcH0CgG0hj1Qc8CIW4g5Y1293tLcCBLemSQgy4njEXRIKpYu8b4W5lKvAPJD4mY RuJ2WbhGnMAdjqbiC6MhoSptcUHxRY9libr8yh+0kjZO2Cm7a9Mv+YBcJUCTxj9ulqVj 8xzMwJeITUrrXM/CX6TRFD6iBmo4oxnWLi3inpO/KnLRg12o+Yybd8wSCXu1eOJ1UDIk cySw== X-Gm-Message-State: ALyK8tK4eb7FB8uUNsbVuIh6JPLShci6q0EvBvexMeziwymusJrFroDvtbY28xLsfTc4Wg== X-Received: by 10.66.88.131 with SMTP id bg3mr6597447pab.43.1468349688581; Tue, 12 Jul 2016 11:54:48 -0700 (PDT) Received: from localhost.localdomain ([2404:c805:e00:4700:ae22:bff:fe29:e60c]) by smtp.gmail.com with ESMTPSA id tm1sm6862368pab.31.2016.07.12.11.54.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Jul 2016 11:54:48 -0700 (PDT) Message-ID: <57853cf8.c193420a.83221.11de@mx.google.com> X-Google-Original-Message-ID: <20160712185412.4462-2-me> From: tom.ty89@gmail.com X-Google-Original-From: me To: tj@kernel.org, hare@suse.de Cc: linux-ide@vger.kernel.org, linux-scsi@vger.kernel.org, Tom Yan Subject: [PATCH v2 2/2] libata-scsi: rename ata_msense_ctl_mode() to ata_msense_control() Date: Wed, 13 Jul 2016 02:54:12 +0800 X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160712185412.4462-1-me> References: <20160712185412.4462-1-me> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Tom Yan 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 diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 7e24f0a..bf4cb21 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -2432,7 +2432,7 @@ static unsigned int ata_msense_caching(u16 *id, u8 *buf, bool changeable) } /** - * ata_msense_ctl_mode - Simulate MODE SENSE control mode page + * ata_msense_control - Simulate MODE SENSE control mode page * @dev: ATA device of interest * @buf: output buffer * @changeable: whether changeable parameters are requested @@ -2442,7 +2442,7 @@ static unsigned int ata_msense_caching(u16 *id, u8 *buf, bool changeable) * LOCKING: * None. */ -static unsigned int ata_msense_ctl_mode(struct ata_device *dev, u8 *buf, +static unsigned int ata_msense_control(struct ata_device *dev, u8 *buf, bool changeable) { modecpy(buf, def_control_mpage, sizeof(def_control_mpage), changeable); @@ -2566,13 +2566,13 @@ static unsigned int ata_scsiop_mode_sense(struct ata_scsi_args *args, u8 *rbuf) break; case CONTROL_MPAGE: - p += ata_msense_ctl_mode(args->dev, p, page_control == 1); + p += ata_msense_control(args->dev, p, page_control == 1); break; case ALL_MPAGES: p += ata_msense_rw_recovery(p, page_control == 1); p += ata_msense_caching(args->id, p, page_control == 1); - p += ata_msense_ctl_mode(args->dev, p, page_control == 1); + p += ata_msense_control(args->dev, p, page_control == 1); break; default: /* invalid page code */ @@ -3667,7 +3667,7 @@ static int ata_mselect_control(struct ata_queued_cmd *qc, /* * Check that read-only bits are not modified. */ - ata_msense_ctl_mode(dev, mpage, false); + ata_msense_control(dev, mpage, false); for (i = 0; i < CONTROL_MPAGE_LEN - 2; i++) { if (i == 0) continue;