From nobody Fri Feb 13 00:07:39 2026 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9E64938396; Tue, 4 Jun 2024 16:22:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717518142; cv=none; b=GwItjdGIpkxDuHkKGLqWsyL6MCOqSYXr1nBL/3rQlCcRP2N6gtjP+H/NCPegmDG4ZHeNHFsSHGS3jjJ10Eip8TI7g+ukx0gOzFjg4ZpM15tdMY7VYah/ZGk6mHZMnfgJxGXgwDHfqA4FnVzKq5S1dFsJicWSWlGo/nqzLL5uUtY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717518142; c=relaxed/simple; bh=4q2hlNa+zDXJa5COBXQIsc3F14V8x6epzxiAsFAZOoI=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=ZSVrfTMkZLh6svOcIdlo5rB6I1Z24V+BReEJleNT0ff2GhfkdBbQ0YbToxZpzqg7sg4oJ0oxkqjweUDYD2m5FCZUu8dTsJUqAWt4689XRd4hGpHhZTjdoK7b8a+h8OETmjpn1oc+khQGsZeN8oaYWG9jdpaW/NDApXXMausgQdw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=LgcrjNEh; arc=none smtp.client-ip=209.85.221.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LgcrjNEh" Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-35dbdd76417so3237364f8f.3; Tue, 04 Jun 2024 09:22:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717518139; x=1718122939; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=IWy2LKPjdhg95BnqbKt1+lV4wGwDYmeoHKDzPgQ6cjs=; b=LgcrjNEhaqWuVtxzQ6+heBaeFbg4g411p6r+v0CVcFuwHJwEfpZ8GjP6//SHYJ3jov +DQY5e5GO0yVVml4yqTc3FxYtAVrzQO2xnfjKM0tp3TwlW+S0fCqOM4NgJ80B+XL7QH9 4Ow5RkXy9hfsY0yGP/D0vOVJIwwlNQUQFF3+FJEI6C/BVDys3/fQiXBZzx/MEV3RK/ul aTnDQ7wR/V8KOEIAlNPoZKX0GJpDafdNqxV3MPG+Mii58uP192Fs6ER5+MVVZvTDgUR5 2i3eGSx2AMSqKArwckso1bDSUmZrG806GgUep+msoLyBI2oe+xgm/35VIy1re6HzwKxN tLTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717518139; x=1718122939; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=IWy2LKPjdhg95BnqbKt1+lV4wGwDYmeoHKDzPgQ6cjs=; b=k/Zjf9eULZpYW+whU/Z4aO9F4nmToWJermzX2F458eUqLLi1RlAVopqIo1A81nF175 X2PrBIJ/kb5U6pQjhtBzFEBz95wGOiee/es7UhY+e8lUZsHFFd3+i6GBDy26EceNftHk uh5SgvKC5xF0Rx9hC9Zq2dwE8mVyDPIU1J6cUKFb/uCalBtF0Q/a1hUplQMZvfk4owuM hx65+qhDi614LihtBBU61HEZZW9DrcHFgAYzAVVOQeCMxvlOnlcRgu4NDdmFFK8R6ZXk nlTAzlOAq3zafzQqZVgPj4uHFZgPGrXYSkZJ7c+Ub3HKc50rTxirXmnf7frReCI3vfqg 6pIw== X-Forwarded-Encrypted: i=1; AJvYcCWQiLzOhw9IJ1695McEZun9VPxYQ4TuP0Flhi6pfoueogqNDW8wJ8NmIByJTu+A+MU16XICTXdQN5BABs6i+n0+4pYsaldIuyNZxea3MCiafXvRG96z/+qZ+uBg60o0oE003r4FdicD X-Gm-Message-State: AOJu0YxyrxZcV+brs72LZA+4Pupx4GpDo6gaT341HQyY4BSXfn/1sGQR bi6BClGeZ9t+r+7ogaIYcPQdcxW3UkORI0/EKF+U6CxSf9dIkKIEsd1SJw== X-Google-Smtp-Source: AGHT+IGQcn2kH+FRLVL+o4Kd4ZgcFfbOBcIgSYJPbm8MUBhAkjLzud9V+0CWj8XCDLx/0EhwMUv/VQ== X-Received: by 2002:adf:e38a:0:b0:354:f286:4f0c with SMTP id ffacd0b85a97d-35e0f325d08mr11928496f8f.51.1717518138501; Tue, 04 Jun 2024 09:22:18 -0700 (PDT) Received: from gmail.com ([2a01:e11:1403:8620:1c26:7f4d:9e87:9ebb]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35dd04ca981sm11955409f8f.33.2024.06.04.09.22.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jun 2024 09:22:18 -0700 (PDT) From: Paolo Pisati To: Sergey Shtylyov , Damien Le Moal Cc: linux-m68k@lists.linux-m68k.org, linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ata: pata_buddha: pata_gayle: consolidate .sff_data_xfer around libata::ata_sff_data_xfer() Date: Tue, 4 Jun 2024 18:22:17 +0200 Message-Id: <20240604162217.484789-1-p.pisati@gmail.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" pata_buddha_data_xfer(), pata_gayle_data_xfer() and ata_sff_data_xfer() are= the same function, consolidate around libata::ata_sff_data_xfer(). Signed-off-by: Paolo Pisati --- drivers/ata/pata_buddha.c | 40 ++------------------------------------- drivers/ata/pata_gayle.c | 40 ++------------------------------------- 2 files changed, 4 insertions(+), 76 deletions(-) diff --git a/drivers/ata/pata_buddha.c b/drivers/ata/pata_buddha.c index c36ee991d5e5..234278eb26e1 100644 --- a/drivers/ata/pata_buddha.c +++ b/drivers/ata/pata_buddha.c @@ -60,42 +60,6 @@ static const struct scsi_host_template pata_buddha_sht = =3D { ATA_PIO_SHT(DRV_NAME), }; =20 -/* FIXME: is this needed? */ -static unsigned int pata_buddha_data_xfer(struct ata_queued_cmd *qc, - unsigned char *buf, - unsigned int buflen, int rw) -{ - struct ata_device *dev =3D qc->dev; - struct ata_port *ap =3D dev->link->ap; - void __iomem *data_addr =3D ap->ioaddr.data_addr; - unsigned int words =3D buflen >> 1; - - /* Transfer multiple of 2 bytes */ - if (rw =3D=3D READ) - raw_insw((u16 *)data_addr, (u16 *)buf, words); - else - raw_outsw((u16 *)data_addr, (u16 *)buf, words); - - /* Transfer trailing byte, if any. */ - if (unlikely(buflen & 0x01)) { - unsigned char pad[2] =3D { }; - - /* Point buf to the tail of buffer */ - buf +=3D buflen - 1; - - if (rw =3D=3D READ) { - raw_insw((u16 *)data_addr, (u16 *)pad, 1); - *buf =3D pad[0]; - } else { - pad[0] =3D *buf; - raw_outsw((u16 *)data_addr, (u16 *)pad, 1); - } - words++; - } - - return words << 1; -} - /* * Provide our own set_mode() as we don't want to change anything that has * already been configured.. @@ -131,7 +95,7 @@ static void pata_xsurf_irq_clear(struct ata_port *ap) =20 static struct ata_port_operations pata_buddha_ops =3D { .inherits =3D &ata_sff_port_ops, - .sff_data_xfer =3D pata_buddha_data_xfer, + .sff_data_xfer =3D ata_sff_data_xfer, .sff_irq_check =3D pata_buddha_irq_check, .cable_detect =3D ata_cable_unknown, .set_mode =3D pata_buddha_set_mode, @@ -139,7 +103,7 @@ static struct ata_port_operations pata_buddha_ops =3D { =20 static struct ata_port_operations pata_xsurf_ops =3D { .inherits =3D &ata_sff_port_ops, - .sff_data_xfer =3D pata_buddha_data_xfer, + .sff_data_xfer =3D ata_sff_data_xfer, .sff_irq_check =3D pata_buddha_irq_check, .sff_irq_clear =3D pata_xsurf_irq_clear, .cable_detect =3D ata_cable_unknown, diff --git a/drivers/ata/pata_gayle.c b/drivers/ata/pata_gayle.c index 3bdbe2b65a2b..febffc36a18f 100644 --- a/drivers/ata/pata_gayle.c +++ b/drivers/ata/pata_gayle.c @@ -38,42 +38,6 @@ static const struct scsi_host_template pata_gayle_sht = =3D { ATA_PIO_SHT(DRV_NAME), }; =20 -/* FIXME: is this needed? */ -static unsigned int pata_gayle_data_xfer(struct ata_queued_cmd *qc, - unsigned char *buf, - unsigned int buflen, int rw) -{ - struct ata_device *dev =3D qc->dev; - struct ata_port *ap =3D dev->link->ap; - void __iomem *data_addr =3D ap->ioaddr.data_addr; - unsigned int words =3D buflen >> 1; - - /* Transfer multiple of 2 bytes */ - if (rw =3D=3D READ) - raw_insw((u16 *)data_addr, (u16 *)buf, words); - else - raw_outsw((u16 *)data_addr, (u16 *)buf, words); - - /* Transfer trailing byte, if any. */ - if (unlikely(buflen & 0x01)) { - unsigned char pad[2] =3D { }; - - /* Point buf to the tail of buffer */ - buf +=3D buflen - 1; - - if (rw =3D=3D READ) { - raw_insw((u16 *)data_addr, (u16 *)pad, 1); - *buf =3D pad[0]; - } else { - pad[0] =3D *buf; - raw_outsw((u16 *)data_addr, (u16 *)pad, 1); - } - words++; - } - - return words << 1; -} - /* * Provide our own set_mode() as we don't want to change anything that has * already been configured.. @@ -110,7 +74,7 @@ static void pata_gayle_irq_clear(struct ata_port *ap) =20 static struct ata_port_operations pata_gayle_a1200_ops =3D { .inherits =3D &ata_sff_port_ops, - .sff_data_xfer =3D pata_gayle_data_xfer, + .sff_data_xfer =3D ata_sff_data_xfer, .sff_irq_check =3D pata_gayle_irq_check, .sff_irq_clear =3D pata_gayle_irq_clear, .cable_detect =3D ata_cable_unknown, @@ -119,7 +83,7 @@ static struct ata_port_operations pata_gayle_a1200_ops = =3D { =20 static struct ata_port_operations pata_gayle_a4000_ops =3D { .inherits =3D &ata_sff_port_ops, - .sff_data_xfer =3D pata_gayle_data_xfer, + .sff_data_xfer =3D ata_sff_data_xfer, .cable_detect =3D ata_cable_unknown, .set_mode =3D pata_gayle_set_mode, }; --=20 2.34.1