netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Rafał Miłecki" <zajec5@gmail.com>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: "Network Development" <netdev@vger.kernel.org>,
	"Linus Torvalds" <torvalds@linux-foundation.org>,
	"Arend van Spriel" <arend@broadcom.com>,
	"Larry Finger" <Larry.Finger@lwfinger.net>,
	"Alwin Beukers" <alwin@broadcom.com>,
	"Roland Vossen" <rvossen@broadcom.com>,
	"Franky (Zhenhui) Lin" <frankyl@broadcom.com>,
	"Rafał Miłecki" <zajec5@gmail.com>
Subject: [PATCH V2 3/5] bcma: add stub for bcma_bus_suspend()
Date: Fri, 13 Jan 2012 23:58:40 +0100	[thread overview]
Message-ID: <1326495522-6024-3-git-send-email-zajec5@gmail.com> (raw)
In-Reply-To: <1326495522-6024-1-git-send-email-zajec5@gmail.com>

From: Linus Torvalds <torvalds@linux-foundation.org>

.. and connect it up with the pci host bcma driver.

Now, the next step is to connect those bcma bus-level suspend/resume
functions to the actual bcma device suspend resume functions.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
 drivers/bcma/bcma_private.h |    1 +
 drivers/bcma/host_pci.c     |    2 +-
 drivers/bcma/main.c         |    5 +++++
 3 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/drivers/bcma/bcma_private.h b/drivers/bcma/bcma_private.h
index fda56bd..0def898 100644
--- a/drivers/bcma/bcma_private.h
+++ b/drivers/bcma/bcma_private.h
@@ -19,6 +19,7 @@ int __init bcma_bus_early_register(struct bcma_bus *bus,
 				   struct bcma_device *core_cc,
 				   struct bcma_device *core_mips);
 #ifdef CONFIG_PM
+int bcma_bus_suspend(struct bcma_bus *bus);
 int bcma_bus_resume(struct bcma_bus *bus);
 #endif
 
diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c
index 86dfeea..f59244e 100644
--- a/drivers/bcma/host_pci.c
+++ b/drivers/bcma/host_pci.c
@@ -242,7 +242,7 @@ static int bcma_host_pci_suspend(struct device *dev)
 
 	bus->mapped_core = NULL;
 
-	return 0;
+	return bcma_bus_suspend(bus);
 }
 
 static int bcma_host_pci_resume(struct device *dev)
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index 10f92b3..b711d9d 100644
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -241,6 +241,11 @@ int __init bcma_bus_early_register(struct bcma_bus *bus,
 }
 
 #ifdef CONFIG_PM
+int bcma_bus_suspend(struct bcma_bus *bus)
+{
+	return 0;
+}
+
 int bcma_bus_resume(struct bcma_bus *bus)
 {
 	struct bcma_device *core;
-- 
1.7.7

  parent reply	other threads:[~2012-01-13 22:58 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-13 22:58 [PATCH V2 1/5][STABLE] bcma: invalidate the mapped core over suspend/resume Rafał Miłecki
2012-01-13 22:58 ` [PATCH V2 2/5] bcma: convert suspend/resume to pm_ops Rafał Miłecki
2012-01-13 22:58 ` Rafał Miłecki [this message]
2012-01-13 22:58 ` [PATCH V2 4/5] bcma: connect the bcma bus suspend/resume to the bcma driver suspend/resume Rafał Miłecki
2012-01-13 22:58 ` [PATCH V2 5/5] brcmsmac: remove PCI suspend/resume from bcma driver Rafał Miłecki

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=1326495522-6024-3-git-send-email-zajec5@gmail.com \
    --to=zajec5@gmail.com \
    --cc=Larry.Finger@lwfinger.net \
    --cc=alwin@broadcom.com \
    --cc=arend@broadcom.com \
    --cc=frankyl@broadcom.com \
    --cc=linville@tuxdriver.com \
    --cc=netdev@vger.kernel.org \
    --cc=rvossen@broadcom.com \
    --cc=torvalds@linux-foundation.org \
    /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).