From patchwork Mon Oct 1 18:22:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwendal Grignou X-Patchwork-Id: 188326 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 DF0B02C00FF for ; Tue, 2 Oct 2012 04:23:15 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751955Ab2JASXO (ORCPT ); Mon, 1 Oct 2012 14:23:14 -0400 Received: from mail-wi0-f202.google.com ([209.85.212.202]:58741 "EHLO mail-wi0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751333Ab2JASXN (ORCPT ); Mon, 1 Oct 2012 14:23:13 -0400 Received: by wibhr7 with SMTP id hr7so150427wib.1 for ; Mon, 01 Oct 2012 11:23:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to; bh=F3P/P7aHJ/fYHT/32ZPlBHVH/qLWW88rQ2HpAHUievk=; b=Lts9+x98JsZGW77TqTHcyYCqEkwh8JdcKtTDG4h+MpBrxXLoYBP4H+R3CMaE5LMDmZ stSWTHqJcsy26dD030nMYljBgYf+BS0EHzx39YiWeAkhcQfe/RFhskkVtUDsTAzqHhYJ pCMNB7MdJpRZae4Pzqhpt6A+2qZJFCYTroTaxJkTKRE0C5L7K1tzNTn+Aoh9GlFGkW8F EauvUeWSs6vex3umpL1qYt4m9hcgAiFwwqRXrFHFv7zK7NrQ/WQNymzH0yFu6D9WTpRw ksO/feJPZFrbTqZPp+F7OXBLNYfBXXsFM6O1a7QEWTog/RneygW2CL2lHNCQNTXRcQ2+ z0Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:x-gm-message-state; bh=F3P/P7aHJ/fYHT/32ZPlBHVH/qLWW88rQ2HpAHUievk=; b=cbGhSp0nrUhQIGdHwYf7ey3krPzMOgEOvI06TWWDEuQChXlDni45psnC3QzSyYb3dA XoAWWEjn/HDzTaSnS7eN4FjWwHS5OT4sB4/k2E1QQqwVs4HbCNXYEA2fITY4MEdZEmQO DFpBubQVBNLyjdwOh2sIjayJB4woe+iMgkhlep94kOc36q2G0mn/VYloxL6QXROGMvN/ MbFT2pkR7Iuev+4tdb+6wAP+acvi9oLOPlPr1ni5YgUZ5uZvPyRVNlZ+WAs051HSCtqD 0mNBdrJcQRcRb43R5mIFPGgH169zbM1PSQbqmamlIzdIXEJxV5lWpSeTN1P/N9tVQnuL z00w== Received: by 10.180.106.102 with SMTP id gt6mr2138751wib.0.1349115791954; Mon, 01 Oct 2012 11:23:11 -0700 (PDT) Received: from hpza9.eem.corp.google.com ([74.125.121.33]) by gmr-mx.google.com with ESMTPS id fb20si845999wid.3.2012.10.01.11.23.11 (version=TLSv1/SSLv3 cipher=AES128-SHA); Mon, 01 Oct 2012 11:23:11 -0700 (PDT) Received: from hippo3.mtv.corp.google.com (hippo3.mtv.corp.google.com [172.18.110.76]) by hpza9.eem.corp.google.com (Postfix) with ESMTP id 8B6F35C0050; Mon, 1 Oct 2012 11:23:11 -0700 (PDT) Received: by hippo3.mtv.corp.google.com (Postfix, from userid 60833) id E6A2820703; Mon, 1 Oct 2012 11:23:10 -0700 (PDT) From: Gwendal Grignou To: aaron.lu@intel.com, minggr@gmail.com, tj@kernel.org, jgarzik@pobox.com, james.bottomley@hansenpartnership.com Cc: Gwendal Grignou , linux-scsi@vger.kernel.org, linux-ide@vger.kernel.org Subject: [PATCH 1/3] Revert "ata: make ata port as parent device of scsi host" Date: Mon, 1 Oct 2012 11:22:54 -0700 Message-Id: <1349115776-17569-2-git-send-email-gwendal@google.com> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1349115776-17569-1-git-send-email-gwendal@google.com> References: <20120928062709.GA2091@mint-spring.sh.intel.com> <1349115776-17569-1-git-send-email-gwendal@google.com> In-Reply-To: <50672B03.8000101@mvista.com> X-Gm-Message-State: ALoCoQmJTcojekYnhGhG+EfCbP3Kf9IFfHblMRxtXHV1gAKXRDlUEXgdn5J0IPe1dbJs+MqAImuOluqxdUoJBE0Kahhopun2Ozfb71lBk5M+aJBl/Aq0l9ghVBMmgHxjKREWWZvWEk8jIU6CzghcfIPw+FeyS3u11xIlvlqOwruEXsdaMQVQqevAxGvfiRE0qqJ+sZgh6xm2c1ZvzSc26F6Q++CY1HA8Nw== Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org This reverts commit 9a6d6a2ddabbd32c07f6a38b659e5f3db319fa5a. Instead, melt libata transport sysfs object in scsi objects. Signed-off-by: Gwendal Grignou --- drivers/ata/libata-scsi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index e3bda07..be38930 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -3609,7 +3609,7 @@ int ata_scsi_add_hosts(struct ata_host *host, struct scsi_host_template *sht) shost->max_host_blocked = 1; rc = scsi_add_host_with_dma(ap->scsi_host, - &ap->tdev, ap->host->dev); + host->dev, host->dev); if (rc) goto err_add; }