linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: "Rafael J . Wysocki" <rjw@rjwysocki.net>,
	linux-acpi@vger.kernel.org, Vinod Koul <vinod.koul@intel.com>,
	dmaengine@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Jarkko Nikula <jarkko.nikula@linux.intel.com>,
	linux-kernel@vger.kernel.org,
	Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v3 9/9] Revert "dmaengine: dw: platform: provide platform data for Intel"
Date: Fri,  4 Dec 2015 23:49:25 +0200	[thread overview]
Message-ID: <1449265765-9393-10-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1449265765-9393-1-git-send-email-andriy.shevchenko@linux.intel.com>

Since we have a work around to prevent a system hangup we don't need to provide
a platform data explicitly anymore.

This reverts commit 175267b389f781748e2bbb6c737e76b5c9bc4c88.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/dma/dw/platform.c | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/drivers/dma/dw/platform.c b/drivers/dma/dw/platform.c
index d0734e9..127093a 100644
--- a/drivers/dma/dw/platform.c
+++ b/drivers/dma/dw/platform.c
@@ -155,7 +155,6 @@ static int dw_probe(struct platform_device *pdev)
 	struct dw_dma_chip *chip;
 	struct device *dev = &pdev->dev;
 	struct resource *mem;
-	const struct acpi_device_id *id;
 	struct dw_dma_platform_data *pdata;
 	int err;
 
@@ -179,11 +178,6 @@ static int dw_probe(struct platform_device *pdev)
 	pdata = dev_get_platdata(dev);
 	if (!pdata)
 		pdata = dw_dma_parse_dt(pdev);
-	if (!pdata && has_acpi_companion(dev)) {
-		id = acpi_match_device(dev->driver->acpi_match_table, dev);
-		if (id)
-			pdata = (struct dw_dma_platform_data *)id->driver_data;
-	}
 
 	chip->dev = dev;
 
@@ -264,17 +258,8 @@ MODULE_DEVICE_TABLE(of, dw_dma_of_id_table);
 #endif
 
 #ifdef CONFIG_ACPI
-static struct dw_dma_platform_data dw_dma_acpi_pdata = {
-	.nr_channels = 8,
-	.is_private = true,
-	.chan_allocation_order = CHAN_ALLOCATION_ASCENDING,
-	.chan_priority = CHAN_PRIORITY_ASCENDING,
-	.block_size = 4095,
-	.nr_masters = 2,
-};
-
 static const struct acpi_device_id dw_dma_acpi_id_table[] = {
-	{ "INTL9C60", (kernel_ulong_t)&dw_dma_acpi_pdata },
+	{ "INTL9C60", 0 },
 	{ }
 };
 MODULE_DEVICE_TABLE(acpi, dw_dma_acpi_id_table);
-- 
2.6.2


  parent reply	other threads:[~2015-12-04 21:52 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-04 21:49 [PATCH v3 0/9] ACPI / LPSS: fix system hangup on BYT/BSW/CHT Andy Shevchenko
2015-12-04 21:49 ` [PATCH v3 1/9] device core: add BUS_NOTIFY_DRIVER_NOT_BOUND notification Andy Shevchenko
2015-12-05 16:14   ` Greg Kroah-Hartman
2015-12-05 16:24     ` Andy Shevchenko
2015-12-05 16:36       ` Greg Kroah-Hartman
2015-12-07  1:31         ` Rafael J. Wysocki
2015-12-07 10:57           ` Andy Shevchenko
2015-12-07 22:59             ` Rafael J. Wysocki
2015-12-08 13:32               ` Thomas Gleixner
2015-12-08 14:05                 ` Rafael J. Wysocki
2015-12-08 13:50                   ` Andy Shevchenko
2015-12-09  1:20                     ` Rafael J. Wysocki
2015-12-09  1:09                       ` Andy Shevchenko
2015-12-04 21:49 ` [PATCH v3 2/9] Revert "ACPI / LPSS: allow to use specific PM domain during ->probe()" Andy Shevchenko
2015-12-04 21:49 ` [PATCH v3 3/9] ACPI / LPSS: allow to use specific PM domain during ->probe() Andy Shevchenko
2015-12-04 21:49 ` [PATCH v3 4/9] ACPI / LPSS: power on when probe() and otherwise when remove() Andy Shevchenko
2015-12-04 21:49 ` [PATCH v3 5/9] ACPI / LPSS: do delay for all LPSS devices when D3->D0 Andy Shevchenko
2015-12-04 21:49 ` [PATCH v3 6/9] ACPI / LPSS: override power state for LPSS DMA device Andy Shevchenko
2015-12-04 21:49 ` [PATCH v3 7/9] dmaengine: dw: platform: power on device on shutdown Andy Shevchenko
2015-12-08 17:25   ` Vinod Koul
2015-12-04 21:49 ` [PATCH v3 8/9] dmaengine: dw: return immediately from IRQ when DMA isn't in use Andy Shevchenko
2015-12-08 17:25   ` Vinod Koul
2015-12-04 21:49 ` Andy Shevchenko [this message]
2015-12-08 17:27   ` [PATCH v3 9/9] Revert "dmaengine: dw: platform: provide platform data for Intel" Vinod Koul
2015-12-04 23:07 ` [PATCH v3 0/9] ACPI / LPSS: fix system hangup on BYT/BSW/CHT Rafael J. Wysocki
2015-12-04 23:15   ` Andy Shevchenko
2015-12-05  0:07     ` Rafael J. Wysocki
2015-12-08  4:39       ` Jacob Pan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1449265765-9393-10-git-send-email-andriy.shevchenko@linux.intel.com \
    --to=andriy.shevchenko@linux.intel.com \
    --cc=dmaengine@vger.kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=jarkko.nikula@linux.intel.com \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mika.westerberg@linux.intel.com \
    --cc=rjw@rjwysocki.net \
    --cc=tglx@linutronix.de \
    --cc=vinod.koul@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).