From patchwork Fri Jan 29 16:07:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 43974 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 35A71B7D1C for ; Sat, 30 Jan 2010 03:16:29 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755246Ab0A2QO5 (ORCPT ); Fri, 29 Jan 2010 11:14:57 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755209Ab0A2QHx (ORCPT ); Fri, 29 Jan 2010 11:07:53 -0500 Received: from mail-fx0-f220.google.com ([209.85.220.220]:53041 "EHLO mail-fx0-f220.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755057Ab0A2QHv (ORCPT ); Fri, 29 Jan 2010 11:07:51 -0500 Received: by mail-fx0-f220.google.com with SMTP id 20so2015120fxm.21 for ; Fri, 29 Jan 2010 08:07:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:date:message-id :in-reply-to:references:subject; bh=b1W178IsLMs/pmbgj7T7WgMS4+bluFkz026+hf0Q9w4=; b=YgEkWB0G1rA1jm1BbwwbZWbzEqM721maJqfHnKGZ/UJIWVKdNsWpeujfJsopigD2Qr 5fYmMU64Xn6NemmR+7fNLvE5Xmc3pvCwZZjS/UVVpwSalENSR6OSrP9x5+CjSwHioUrA prm4OM2+ksaV7LWQH6ivB61oHr5HydCnoR9s4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:in-reply-to:references:subject; b=ESL1dQGZQPFrzx3TmUlUk24LdRuQvxU3OP5vOb/QQ05nPBEZRhX9XfY9jFTmCsbxDX qTTXZIpTS8jyE3WDfXcdIIYD0DBN8KW29BNrN76wyi3qtXdWLhy/mLq1CSBDao2NvpRw 9T6tcERINuQJJwg+fU7bUUJUp2xye8t8X+c90= Received: by 10.223.15.86 with SMTP id j22mr920954faa.47.1264781270380; Fri, 29 Jan 2010 08:07:50 -0800 (PST) Received: from ?127.0.0.1? (chello089079027028.chello.pl [89.79.27.28]) by mx.google.com with ESMTPS id 16sm551461fxm.4.2010.01.29.08.07.49 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 29 Jan 2010 08:07:49 -0800 (PST) From: Bartlomiej Zolnierkiewicz To: linux-ide@vger.kernel.org Cc: Bartlomiej Zolnierkiewicz , linux-kernel@vger.kernel.org Date: Fri, 29 Jan 2010 17:07:43 +0100 Message-Id: <20100129160743.21495.78502.sendpatchset@localhost> In-Reply-To: <20100129160308.21495.14120.sendpatchset@localhost> References: <20100129160308.21495.14120.sendpatchset@localhost> Subject: [PATCH 43/68] cs5520: convert to ide2libata Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From: Bartlomiej Zolnierkiewicz Subject: [PATCH] cs5520: convert to ide2libata Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/ide/cs5520.c | 44 ++++---------------------------------------- 1 file changed, 4 insertions(+), 40 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: b/drivers/ide/cs5520.c =================================================================== --- a/drivers/ide/cs5520.c +++ b/drivers/ide/cs5520.c @@ -42,55 +42,19 @@ #define DRV_NAME "cs5520" -struct pio_clocks -{ - int address; - int assert; - int recovery; -}; - -static struct pio_clocks cs5520_pio_clocks[]={ - {3, 6, 11}, - {2, 5, 6}, - {1, 4, 3}, - {1, 3, 2}, - {1, 2, 1} -}; - -static void cs5520_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive) -{ - struct pci_dev *pdev = to_pci_dev(hwif->dev); - int controller = drive->dn > 1 ? 1 : 0; - const u8 pio = drive->pio_mode - XFER_PIO_0; - - /* 8bit CAT/CRT - 8bit command timing for channel */ - pci_write_config_byte(pdev, 0x62 + controller, - (cs5520_pio_clocks[pio].recovery << 4) | - (cs5520_pio_clocks[pio].assert)); - - /* 0x64 - 16bit Primary, 0x68 - 16bit Secondary */ - - /* FIXME: should these use address ? */ - /* Data read timing */ - pci_write_config_byte(pdev, 0x64 + 4*controller + (drive->dn&1), - (cs5520_pio_clocks[pio].recovery << 4) | - (cs5520_pio_clocks[pio].assert)); - /* Write command timing */ - pci_write_config_byte(pdev, 0x66 + 4*controller + (drive->dn&1), - (cs5520_pio_clocks[pio].recovery << 4) | - (cs5520_pio_clocks[pio].assert)); -} +#include +#include "../ata/pata_cs5520.h" static void cs5520_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive) { printk(KERN_ERR "cs55x0: bad ide timing.\n"); drive->pio_mode = XFER_PIO_0 + 0; - cs5520_set_pio_mode(hwif, drive); + cs5520_set_piomode(hwif, drive); } static const struct ide_port_ops cs5520_port_ops = { - .set_pio_mode = cs5520_set_pio_mode, + .set_pio_mode = cs5520_set_piomode, .set_dma_mode = cs5520_set_dma_mode, };