From patchwork Thu Sep 27 19:04:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwendal Grignou X-Patchwork-Id: 187448 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 C974C2C00B6 for ; Fri, 28 Sep 2012 05:04:20 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754127Ab2I0TER (ORCPT ); Thu, 27 Sep 2012 15:04:17 -0400 Received: from mail-ee0-f74.google.com ([74.125.83.74]:60775 "EHLO mail-ee0-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753327Ab2I0TEQ (ORCPT ); Thu, 27 Sep 2012 15:04:16 -0400 Received: by eekb57 with SMTP id b57so158215eek.1 for ; Thu, 27 Sep 2012 12:04:15 -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:references; bh=DSpxCQwbfc3MxkIiq/WvBEvfQK1FBkLR5g7PDZN/dtM=; b=gMBrjiY0hRpHAMsWlmUb9bAPR9/jnfotATWKXEGvqlwDiXw/ESqbZwsdNcLWDq3rMB xu7jdamJeMpRMzMtFMOo6I1+movq/mL8v/0y7m9MkZJfc1H5tmmzUNjOfX2F8yjKfiWr s8vr7sD64lsYt7ZIsqD6qQtAxgmXzBon1HemlmwOAYIc/JESwvV1+2T8HC9oOdt6Gu1V ewNZODtsvnCWLN0Lj+Mm4N6BiYPnnBFYB+lN0Rt6/quGPTfCPmv69puE2iCqdYsGDhMm bboFWvIuBHtfvobD56uhsV9qVz+3PnUbzGgfBHFFfqOoZL+S/Luhk33EomoA+CD3vd8y pB1w== 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:references:x-gm-message-state; bh=DSpxCQwbfc3MxkIiq/WvBEvfQK1FBkLR5g7PDZN/dtM=; b=jgZVwqy2yNtw15AtNUeFiOe2nhU9+PcupEaKHNefXU2Kj8dmMEMap/xAxT1NY6Ybpg LZiqh6BDxr45p062j4NWN0viW4PB7r3sNlX6dZy7I5KcrYPQP9nTae5mDaFmVNY6Q8F5 XbwQQ6K8iaO62VAiwJob3LUNIu8UF3IG9bX/XIAkGGDSwE0nR898NoLGKk2szisr8ax6 t/Cy4md/2rNxrlI0TYV9DdM99cSvZPT7xwU03pziSn3Wr7kkJPbvIm9iamkaslL+JGgE UYl/pSwgPONJCy8hKbQSnSNYpXIBzxB+Z3RfHGdONwfVaErNsN1kz/PIoarGmWjjIWma azcw== Received: by 10.181.11.234 with SMTP id el10mr1419563wid.2.1348772655269; Thu, 27 Sep 2012 12:04:15 -0700 (PDT) Received: from hpza10.eem.corp.google.com ([74.125.121.33]) by gmr-mx.google.com with ESMTPS id b5si1822020wie.2.2012.09.27.12.04.15 (version=TLSv1/SSLv3 cipher=AES128-SHA); Thu, 27 Sep 2012 12:04:15 -0700 (PDT) Received: from hippo3.mtv.corp.google.com (hippo3.mtv.corp.google.com [172.18.110.76]) by hpza10.eem.corp.google.com (Postfix) with ESMTP id D9D10200057; Thu, 27 Sep 2012 12:04:14 -0700 (PDT) Received: by hippo3.mtv.corp.google.com (Postfix, from userid 60833) id 23A4A206B3; Thu, 27 Sep 2012 12:04:13 -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: Thu, 27 Sep 2012 12:04:02 -0700 Message-Id: <1348772644-12486-2-git-send-email-gwendal@google.com> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1348772644-12486-1-git-send-email-gwendal@google.com> References: <1348772644-12486-1-git-send-email-gwendal@google.com> In-Reply-To: <20120920020145.GA23210@mint-spring.sh.intel.com> References: <20120920020145.GA23210@mint-spring.sh.intel.com> X-Gm-Message-State: ALoCoQl1Gjfn4fXVtm3l7IZZBYzYIVLijvMAAEVi88hNYmP4t5Kv5HMEBTLgkNvVxrvzzbrm2/Hw0kEX/ZCCHyBeFOv7jk3dagj/Od84gGG/KnA563R0YQiEJYQ1IXuMdr70pZS4dOrYJcWb6aqe3BXau0DltGYRvWqH7NW/kCA7IE2bluoSoVsHPwgpjyQ444QJ6BE2/m1ym75k/lXBGaZGcjydmQJIYA== 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. Change-Id: I8c709f63ddf7ba97b9e6f449d5c0b8b85e44e818 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; }