From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bartlomiej Zolnierkiewicz Subject: [git pull] IDE fixes Date: Mon, 19 Jan 2009 13:50:05 +0100 Message-ID: <200901191350.06538.bzolnier@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: base64 Return-path: Received: from nf-out-0910.google.com ([64.233.182.186]:25395 "EHLO nf-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759045AbZASMxB (ORCPT ); Mon, 19 Jan 2009 07:53:01 -0500 Content-Disposition: inline Sender: linux-ide-owner@vger.kernel.org List-Id: linux-ide@vger.kernel.org To: Linus Torvalds Cc: Andrew Morton , Stephen Rothwell , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org CkxpbnVzLCBwbGVhc2UgcHVsbCBmcm9tOgoKbWFzdGVyLmtlcm5lbC5vcmc6L3B1Yi9zY20vbGlu dXgva2VybmVsL2dpdC9iYXJ0L2lkZS0yLjYuZ2l0LwoKdG8gcmVjZWl2ZSB0aGUgZm9sbG93aW5n IHVwZGF0ZXM6CgogZHJpdmVycy9pZGUvZmFsY29uaWRlLmMgICB8ICAgIDIgKy0KIGRyaXZlcnMv aWRlL2lkZS1wcm9iZS5jICAgfCAgICAzICsrLQogZHJpdmVycy9pZGUvcGFsbV9iazM3MTAuYyB8 ICAgMTEgKysrKysrKy0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTAgaW5zZXJ0aW9ucygrKSwgNiBk ZWxldGlvbnMoLSkKCgpBbmRyZWFzIFNjaHdhYiAoMSk6CiAgICAgIGlkZTogZml4IElERSBQTUFD IGJyZWFrYWdlCgpEYXZpZCBCcm93bmVsbCAoMSk6CiAgICAgIGRyaXZlcnMvaWRlL3BhbG1fYmsz NzEwLmMgYnVpbGRmaXgKCk1pY2hhZWwgU2NobWl0eiAoMSk6CiAgICAgIGlkZTogZml4IEZhbGNv biBJREUgYnJlYWthZ2UKCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9pZGUvZmFsY29uaWRlLmMgYi9k cml2ZXJzL2lkZS9mYWxjb25pZGUuYwppbmRleCBhNWJhODIwLi5hNjM4ZTk1IDEwMDY0NAotLS0g YS9kcml2ZXJzL2lkZS9mYWxjb25pZGUuYworKysgYi9kcml2ZXJzL2lkZS9mYWxjb25pZGUuYwpA QCAtODIsNyArODIsNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGlkZV90cF9vcHMgZmFsY29uaWRl X3RwX29wcyA9IHsKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBpZGVfcG9ydF9pbmZvIGZhbGNvbmlk ZV9wb3J0X2luZm8gPSB7CiAJLnRwX29wcwkJCT0gJmZhbGNvbmlkZV90cF9vcHMsCi0JLmhvc3Rf ZmxhZ3MJCT0gSURFX0hGTEFHX05PX0RNQSwKKwkuaG9zdF9mbGFncwkJPSBJREVfSEZMQUdfTk9f RE1BIHwgSURFX0hGTEFHX1NFUklBTElaRSwKIH07CiAKIHN0YXRpYyB2b2lkIF9faW5pdCBmYWxj b25pZGVfc2V0dXBfcG9ydHMoaHdfcmVnc190ICpodykKZGlmZiAtLWdpdCBhL2RyaXZlcnMvaWRl L2lkZS1wcm9iZS5jIGIvZHJpdmVycy9pZGUvaWRlLXByb2JlLmMKaW5kZXggMzEyMTI3ZS4uMGRi MWVkOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9pZGUvaWRlLXByb2JlLmMKKysrIGIvZHJpdmVycy9p ZGUvaWRlLXByb2JlLmMKQEAgLTY0OSw3ICs2NDksOCBAQCBzdGF0aWMgaW50IGlkZV9yZWdpc3Rl cl9wb3J0KGlkZV9od2lmX3QgKmh3aWYpCiAJLyogcmVnaXN0ZXIgd2l0aCBnbG9iYWwgZGV2aWNl IHRyZWUgKi8KIAlkZXZfc2V0X25hbWUoJmh3aWYtPmdlbmRldiwgaHdpZi0+bmFtZSk7CiAJaHdp Zi0+Z2VuZGV2LmRyaXZlcl9kYXRhID0gaHdpZjsKLQlod2lmLT5nZW5kZXYucGFyZW50ID0gaHdp Zi0+ZGV2OworCWlmIChod2lmLT5nZW5kZXYucGFyZW50ID09IE5VTEwpCisJCWh3aWYtPmdlbmRl di5wYXJlbnQgPSBod2lmLT5kZXY7CiAJaHdpZi0+Z2VuZGV2LnJlbGVhc2UgPSBod2lmX3JlbGVh c2VfZGV2OwogCiAJcmV0ID0gZGV2aWNlX3JlZ2lzdGVyKCZod2lmLT5nZW5kZXYpOwpkaWZmIC0t Z2l0IGEvZHJpdmVycy9pZGUvcGFsbV9iazM3MTAuYyBiL2RyaXZlcnMvaWRlL3BhbG1fYmszNzEw LmMKaW5kZXggYTdhYzQ5MC4uZjM4YWFjNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9pZGUvcGFsbV9i azM3MTAuYworKysgYi9kcml2ZXJzL2lkZS9wYWxtX2JrMzcxMC5jCkBAIC0zNDYsNyArMzQ2LDgg QEAgc3RhdGljIGludCBfX2luaXQgcGFsbV9iazM3MTBfcHJvYmUoc3RydWN0IHBsYXRmb3JtX2Rl dmljZSAqcGRldikKIHsKIAlzdHJ1Y3QgY2xrICpjbGs7CiAJc3RydWN0IHJlc291cmNlICptZW0s ICppcnE7Ci0JdW5zaWduZWQgbG9uZyBiYXNlLCByYXRlOworCXZvaWQgX19pb21lbSAqYmFzZTsK Kwl1bnNpZ25lZCBsb25nIHJhdGU7CiAJaW50IGksIHJjOwogCWh3X3JlZ3NfdCBodywgKmh3c1td ID0geyAmaHcsIE5VTEwsIE5VTEwsIE5VTEwgfTsKIApAQCAtMzgyLDExICszODMsMTMgQEAgc3Rh dGljIGludCBfX2luaXQgcGFsbV9iazM3MTBfcHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAq cGRldikKIAliYXNlID0gSU9fQUREUkVTUyhtZW0tPnN0YXJ0KTsKIAogCS8qIENvbmZpZ3VyZSB0 aGUgUGFsbSBDaGlwIGNvbnRyb2xsZXIgKi8KLQlwYWxtX2JrMzcxMF9jaGlwaW5pdCgodm9pZCBf X2lvbWVtICopYmFzZSk7CisJcGFsbV9iazM3MTBfY2hpcGluaXQoYmFzZSk7CiAKIAlmb3IgKGkg PSAwOyBpIDwgSURFX05SX1BPUlRTIC0gMjsgaSsrKQotCQlody5pb19wb3J0c19hcnJheVtpXSA9 IGJhc2UgKyBJREVfUEFMTV9BVEFfUFJJX1JFR19PRkZTRVQgKyBpOwotCWh3LmlvX3BvcnRzLmN0 bF9hZGRyID0gYmFzZSArIElERV9QQUxNX0FUQV9QUklfQ1RMX09GRlNFVDsKKwkJaHcuaW9fcG9y dHNfYXJyYXlbaV0gPSAodW5zaWduZWQgbG9uZykKKwkJCQkoYmFzZSArIElERV9QQUxNX0FUQV9Q UklfUkVHX09GRlNFVCArIGkpOworCWh3LmlvX3BvcnRzLmN0bF9hZGRyID0gKHVuc2lnbmVkIGxv bmcpCisJCQkoYmFzZSArIElERV9QQUxNX0FUQV9QUklfQ1RMX09GRlNFVCk7CiAJaHcuaXJxID0g aXJxLT5zdGFydDsKIAlody5kZXYgPSAmcGRldi0+ZGV2OwogCWh3LmNoaXBzZXQgPSBpZGVfcGFs bTM3MTA7CgAK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760170AbZASMxU (ORCPT ); Mon, 19 Jan 2009 07:53:20 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759200AbZASMxE (ORCPT ); Mon, 19 Jan 2009 07:53:04 -0500 Received: from nf-out-0910.google.com ([64.233.182.186]:25395 "EHLO nf-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759045AbZASMxB (ORCPT ); Mon, 19 Jan 2009 07:53:01 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:user-agent:cc:mime-version:content-disposition:date :content-type:content-transfer-encoding:message-id; b=ZQHJpKm510LyKjHAO9cQTfORZ0r+LvbTasEXQYJczOoOBHACCi5ZU/i/wHqoBCU2fr V2mfYGpecmzJPmf34ERDEup6jQhYGV0W0dQqWmSq+ueME7iRItbXPZ7dS24YAjuARD7l hTIkulOykdthnjmXF+Cqr7wUtb2m1Z3VbyuVo= From: Bartlomiej Zolnierkiewicz To: Linus Torvalds Subject: [git pull] IDE fixes User-Agent: KMail/1.9.9 Cc: Andrew Morton , Stephen Rothwell , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Content-Disposition: inline Date: Mon, 19 Jan 2009 13:50:05 +0100 Content-Type: text/plain; charset="iso-8859-1" Message-Id: <200901191350.06538.bzolnier@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by alpha id n0JCrOwM016214 Linus, please pull from: master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6.git/ to receive the following updates: drivers/ide/falconide.c | 2 +- drivers/ide/ide-probe.c | 3 ++- drivers/ide/palm_bk3710.c | 11 +++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) Andreas Schwab (1): ide: fix IDE PMAC breakage David Brownell (1): drivers/ide/palm_bk3710.c buildfix Michael Schmitz (1): ide: fix Falcon IDE breakage diff --git a/drivers/ide/falconide.c b/drivers/ide/falconide.cindex a5ba820..a638e95 100644--- a/drivers/ide/falconide.c+++ b/drivers/ide/falconide.c@@ -82,7 +82,7 @@ static const struct ide_tp_ops falconide_tp_ops = { static const struct ide_port_info falconide_port_info = { .tp_ops = &falconide_tp_ops,- .host_flags = IDE_HFLAG_NO_DMA,+ .host_flags = IDE_HFLAG_NO_DMA | IDE_HFLAG_SERIALIZE, }; static void __init falconide_setup_ports(hw_regs_t *hw)diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.cindex 312127e..0db1ed9 100644--- a/drivers/ide/ide-probe.c+++ b/drivers/ide/ide-probe.c@@ -649,7 +649,8 @@ static int ide_register_port(ide_hwif_t *hwif) /* register with global device tree */ dev_set_name(&hwif->gendev, hwif->name); hwif->gendev.driver_data = hwif;- hwif->gendev.parent = hwif->dev;+ if (hwif->gendev.parent == NULL)+ hwif->gendev.parent = hwif->dev; hwif->gendev.release = hwif_release_dev; ret = device_register(&hwif->gendev);diff --git a/drivers/ide/palm_bk3710.c b/drivers/ide/palm_bk3710.cindex a7ac490..f38aac7 100644--- a/drivers/ide/palm_bk3710.c+++ b/drivers/ide/palm_bk3710.c@@ -346,7 +346,8 @@ static int __init palm_bk3710_probe(struct platform_device *pdev) { struct clk *clk; struct resource *mem, *irq;- unsigned long base, rate;+ void __iomem *base;+ unsigned long rate; int i, rc; hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL }; @@ -382,11 +383,13 @@ static int __init palm_bk3710_probe(struct platform_device *pdev) base = IO_ADDRESS(mem->start); /* Configure the Palm Chip controller */- palm_bk3710_chipinit((void __iomem *)base);+ palm_bk3710_chipinit(base); for (i = 0; i < IDE_NR_PORTS - 2; i++)- hw.io_ports_array[i] = base + IDE_PALM_ATA_PRI_REG_OFFSET + i;- hw.io_ports.ctl_addr = base + IDE_PALM_ATA_PRI_CTL_OFFSET;+ hw.io_ports_array[i] = (unsigned long)+ (base + IDE_PALM_ATA_PRI_REG_OFFSET + i);+ hw.io_ports.ctl_addr = (unsigned long)+ (base + IDE_PALM_ATA_PRI_CTL_OFFSET); hw.irq = irq->start; hw.dev = &pdev->dev; hw.chipset = ide_palm3710;{.n++%ݶw{.n+{G{ayʇڙ,jfhz_(階ݢj"mG?&~iOzv^m ?I