From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: stable-review@kernel.org, torvalds@linux-foundation.org,
akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk,
"Rafael J. Wysocki" <rjw@sisk.pl>
Subject: [patch 29/30] PM / PCMCIA: Drop second argument of pcmcia_socket_dev_suspend()
Date: Thu, 01 Oct 2009 16:31:45 -0700 [thread overview]
Message-ID: <20091001233323.116532896@mini.kroah.org> (raw)
In-Reply-To: <20091001233504.GA17709@kroah.com>
[-- Attachment #1: pm-pcmcia-drop-second-argument-of-pcmcia_socket_dev_suspend.patch --]
[-- Type: text/plain, Size: 8397 bytes --]
2.6.30-stable review patch. If anyone has any objections, please let us know.
------------------
From: Rafael J. Wysocki <rjw@sisk.pl>
commit 827b4649d4626bf97b203b4bcd69476bb9b4e760 upstream.
pcmcia_socket_dev_suspend() doesn't use its second argument, so it
may be dropped safely.
This change is necessary for the subsequent yenta suspend/resume fix.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/pcmcia/at91_cf.c | 2 +-
drivers/pcmcia/au1000_generic.c | 2 +-
drivers/pcmcia/bfin_cf_pcmcia.c | 2 +-
drivers/pcmcia/cs.c | 2 +-
drivers/pcmcia/i82092.c | 2 +-
drivers/pcmcia/i82365.c | 2 +-
drivers/pcmcia/m32r_cfc.c | 2 +-
drivers/pcmcia/m32r_pcc.c | 2 +-
drivers/pcmcia/m8xx_pcmcia.c | 2 +-
drivers/pcmcia/omap_cf.c | 2 +-
drivers/pcmcia/pd6729.c | 2 +-
drivers/pcmcia/pxa2xx_base.c | 2 +-
drivers/pcmcia/sa1100_generic.c | 2 +-
drivers/pcmcia/sa1111_generic.c | 2 +-
drivers/pcmcia/tcic.c | 2 +-
drivers/pcmcia/vrc4171_card.c | 2 +-
drivers/pcmcia/yenta_socket.c | 2 +-
include/pcmcia/ss.h | 2 +-
18 files changed, 18 insertions(+), 18 deletions(-)
--- a/drivers/pcmcia/at91_cf.c
+++ b/drivers/pcmcia/at91_cf.c
@@ -363,7 +363,7 @@ static int at91_cf_suspend(struct platfo
struct at91_cf_socket *cf = platform_get_drvdata(pdev);
struct at91_cf_data *board = cf->board;
- pcmcia_socket_dev_suspend(&pdev->dev, mesg);
+ pcmcia_socket_dev_suspend(&pdev->dev);
if (device_may_wakeup(&pdev->dev)) {
enable_irq_wake(board->det_pin);
if (board->irq_pin)
--- a/drivers/pcmcia/au1000_generic.c
+++ b/drivers/pcmcia/au1000_generic.c
@@ -515,7 +515,7 @@ static int au1x00_drv_pcmcia_probe(struc
static int au1x00_drv_pcmcia_suspend(struct platform_device *dev,
pm_message_t state)
{
- return pcmcia_socket_dev_suspend(&dev->dev, state);
+ return pcmcia_socket_dev_suspend(&dev->dev);
}
static int au1x00_drv_pcmcia_resume(struct platform_device *dev)
--- a/drivers/pcmcia/bfin_cf_pcmcia.c
+++ b/drivers/pcmcia/bfin_cf_pcmcia.c
@@ -302,7 +302,7 @@ static int __devexit bfin_cf_remove(stru
static int bfin_cf_suspend(struct platform_device *pdev, pm_message_t mesg)
{
- return pcmcia_socket_dev_suspend(&pdev->dev, mesg);
+ return pcmcia_socket_dev_suspend(&pdev->dev);
}
static int bfin_cf_resume(struct platform_device *pdev)
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -101,7 +101,7 @@ EXPORT_SYMBOL(pcmcia_socket_list_rwsem);
static int socket_resume(struct pcmcia_socket *skt);
static int socket_suspend(struct pcmcia_socket *skt);
-int pcmcia_socket_dev_suspend(struct device *dev, pm_message_t state)
+int pcmcia_socket_dev_suspend(struct device *dev)
{
struct pcmcia_socket *socket;
--- a/drivers/pcmcia/i82092.c
+++ b/drivers/pcmcia/i82092.c
@@ -42,7 +42,7 @@ MODULE_DEVICE_TABLE(pci, i82092aa_pci_id
#ifdef CONFIG_PM
static int i82092aa_socket_suspend (struct pci_dev *dev, pm_message_t state)
{
- return pcmcia_socket_dev_suspend(&dev->dev, state);
+ return pcmcia_socket_dev_suspend(&dev->dev);
}
static int i82092aa_socket_resume (struct pci_dev *dev)
--- a/drivers/pcmcia/i82365.c
+++ b/drivers/pcmcia/i82365.c
@@ -1241,7 +1241,7 @@ static int pcic_init(struct pcmcia_socke
static int i82365_drv_pcmcia_suspend(struct platform_device *dev,
pm_message_t state)
{
- return pcmcia_socket_dev_suspend(&dev->dev, state);
+ return pcmcia_socket_dev_suspend(&dev->dev);
}
static int i82365_drv_pcmcia_resume(struct platform_device *dev)
--- a/drivers/pcmcia/m32r_cfc.c
+++ b/drivers/pcmcia/m32r_cfc.c
@@ -699,7 +699,7 @@ static struct pccard_operations pcc_oper
static int cfc_drv_pcmcia_suspend(struct platform_device *dev,
pm_message_t state)
{
- return pcmcia_socket_dev_suspend(&dev->dev, state);
+ return pcmcia_socket_dev_suspend(&dev->dev);
}
static int cfc_drv_pcmcia_resume(struct platform_device *dev)
--- a/drivers/pcmcia/m32r_pcc.c
+++ b/drivers/pcmcia/m32r_pcc.c
@@ -675,7 +675,7 @@ static struct pccard_operations pcc_oper
static int pcc_drv_pcmcia_suspend(struct platform_device *dev,
pm_message_t state)
{
- return pcmcia_socket_dev_suspend(&dev->dev, state);
+ return pcmcia_socket_dev_suspend(&dev->dev);
}
static int pcc_drv_pcmcia_resume(struct platform_device *dev)
--- a/drivers/pcmcia/m8xx_pcmcia.c
+++ b/drivers/pcmcia/m8xx_pcmcia.c
@@ -1296,7 +1296,7 @@ static int m8xx_remove(struct of_device
#ifdef CONFIG_PM
static int m8xx_suspend(struct platform_device *pdev, pm_message_t state)
{
- return pcmcia_socket_dev_suspend(&pdev->dev, state);
+ return pcmcia_socket_dev_suspend(&pdev->dev);
}
static int m8xx_resume(struct platform_device *pdev)
--- a/drivers/pcmcia/omap_cf.c
+++ b/drivers/pcmcia/omap_cf.c
@@ -334,7 +334,7 @@ static int __exit omap_cf_remove(struct
static int omap_cf_suspend(struct platform_device *pdev, pm_message_t mesg)
{
- return pcmcia_socket_dev_suspend(&pdev->dev, mesg);
+ return pcmcia_socket_dev_suspend(&pdev->dev);
}
static int omap_cf_resume(struct platform_device *pdev)
--- a/drivers/pcmcia/pd6729.c
+++ b/drivers/pcmcia/pd6729.c
@@ -758,7 +758,7 @@ static void __devexit pd6729_pci_remove(
#ifdef CONFIG_PM
static int pd6729_socket_suspend(struct pci_dev *dev, pm_message_t state)
{
- return pcmcia_socket_dev_suspend(&dev->dev, state);
+ return pcmcia_socket_dev_suspend(&dev->dev);
}
static int pd6729_socket_resume(struct pci_dev *dev)
--- a/drivers/pcmcia/pxa2xx_base.c
+++ b/drivers/pcmcia/pxa2xx_base.c
@@ -302,7 +302,7 @@ static int pxa2xx_drv_pcmcia_remove(stru
static int pxa2xx_drv_pcmcia_suspend(struct platform_device *dev, pm_message_t state)
{
- return pcmcia_socket_dev_suspend(&dev->dev, state);
+ return pcmcia_socket_dev_suspend(&dev->dev);
}
static int pxa2xx_drv_pcmcia_resume(struct platform_device *dev)
--- a/drivers/pcmcia/sa1100_generic.c
+++ b/drivers/pcmcia/sa1100_generic.c
@@ -89,7 +89,7 @@ static int sa11x0_drv_pcmcia_remove(stru
static int sa11x0_drv_pcmcia_suspend(struct platform_device *dev,
pm_message_t state)
{
- return pcmcia_socket_dev_suspend(&dev->dev, state);
+ return pcmcia_socket_dev_suspend(&dev->dev);
}
static int sa11x0_drv_pcmcia_resume(struct platform_device *dev)
--- a/drivers/pcmcia/sa1111_generic.c
+++ b/drivers/pcmcia/sa1111_generic.c
@@ -159,7 +159,7 @@ static int __devexit pcmcia_remove(struc
static int pcmcia_suspend(struct sa1111_dev *dev, pm_message_t state)
{
- return pcmcia_socket_dev_suspend(&dev->dev, state);
+ return pcmcia_socket_dev_suspend(&dev->dev);
}
static int pcmcia_resume(struct sa1111_dev *dev)
--- a/drivers/pcmcia/tcic.c
+++ b/drivers/pcmcia/tcic.c
@@ -366,7 +366,7 @@ static int __init get_tcic_id(void)
static int tcic_drv_pcmcia_suspend(struct platform_device *dev,
pm_message_t state)
{
- return pcmcia_socket_dev_suspend(&dev->dev, state);
+ return pcmcia_socket_dev_suspend(&dev->dev);
}
static int tcic_drv_pcmcia_resume(struct platform_device *dev)
--- a/drivers/pcmcia/vrc4171_card.c
+++ b/drivers/pcmcia/vrc4171_card.c
@@ -707,7 +707,7 @@ __setup("vrc4171_card=", vrc4171_card_se
static int vrc4171_card_suspend(struct platform_device *dev,
pm_message_t state)
{
- return pcmcia_socket_dev_suspend(&dev->dev, state);
+ return pcmcia_socket_dev_suspend(&dev->dev);
}
static int vrc4171_card_resume(struct platform_device *dev)
--- a/drivers/pcmcia/yenta_socket.c
+++ b/drivers/pcmcia/yenta_socket.c
@@ -1230,7 +1230,7 @@ static int yenta_dev_suspend (struct pci
struct yenta_socket *socket = pci_get_drvdata(dev);
int ret;
- ret = pcmcia_socket_dev_suspend(&dev->dev, state);
+ ret = pcmcia_socket_dev_suspend(&dev->dev);
if (socket) {
if (socket->type && socket->type->save_state)
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -279,7 +279,7 @@ extern struct pccard_resource_ops pccard
extern struct pccard_resource_ops pccard_nonstatic_ops;
/* socket drivers are expected to use these callbacks in their .drv struct */
-extern int pcmcia_socket_dev_suspend(struct device *dev, pm_message_t state);
+extern int pcmcia_socket_dev_suspend(struct device *dev);
extern int pcmcia_socket_dev_resume(struct device *dev);
/* socket drivers use this callback in their IRQ handler */
next prev parent reply other threads:[~2009-10-01 23:38 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20091001233116.947658905@mini.kroah.org>
2009-10-01 23:35 ` [patch 00/30] 2.6.30.9-stable review Greg KH
2009-10-01 23:31 ` [patch 01/30] ACPI: pci_slot.ko wants a 64-bit _SUN Greg KH
2009-10-01 23:31 ` [patch 02/30] fs: make sure data stored into inode is properly seen before unlocking new inode Greg KH
2009-10-01 23:31 ` [patch 03/30] kallsyms: fix segfault in prefix_underscores_count() Greg KH
2009-10-01 23:31 ` [patch 04/30] nilfs2: fix missing zero-fill initialization of btree node cache Greg KH
2009-10-01 23:31 ` [patch 05/30] p54usb: add Zcomax XG-705A usbid Greg KH
2009-10-01 23:31 ` [patch 06/30] [CIFS] Re-enable Lanman security Greg KH
2009-10-01 23:31 ` [patch 07/30] KVM: VMX: Check cpl before emulating debug register access Greg KH
2009-10-01 23:31 ` [patch 08/30] KVM: VMX: Fix cr8 exiting control clobbering by EPT Greg KH
2009-10-01 23:31 ` [patch 09/30] KVM: MMU: make __kvm_mmu_free_some_pages handle empty list Greg KH
2009-10-01 23:31 ` [patch 10/30] KVM: x86: Disallow hypercalls for guest callers in rings > 0 Greg KH
2009-10-01 23:31 ` [patch 11/30] KVM: MMU: fix missing locking in alloc_mmu_pages Greg KH
2009-10-01 23:31 ` [patch 12/30] KVM: MMU: fix bogus alloc_mmu_pages assignment Greg KH
2009-10-01 23:31 ` [patch 13/30] KVM: limit lapic periodic timer frequency Greg KH
2009-10-01 23:31 ` [patch 14/30] KVM guest: fix bogus wallclock physical address calculation Greg KH
2009-10-01 23:31 ` [patch 15/30] KVM: fix cpuid E2BIG handling for extended request types Greg KH
2009-10-01 23:31 ` [patch 16/30] Revert "KVM: x86: check for cr3 validity in ioctl_set_sregs" Greg KH
2009-10-01 23:31 ` [patch 17/30] ahci: restore pci_intx() handling Greg KH
2009-10-01 23:31 ` [patch 18/30] net ax25: Fix signed comparison in the sockopt handler Greg KH
2009-10-01 23:31 ` [patch 19/30] net: Make the copy length in af_packet sockopt handler unsigned Greg KH
2009-10-01 23:31 ` [patch 20/30] [CPUFREQ] Fix NULL ptr regression in powernow-k8 Greg KH
2009-10-01 23:31 ` [patch 21/30] netfilter: bridge: refcount fix Greg KH
2009-10-01 23:31 ` [patch 22/30] netfilter: ebt_ulog: fix checkentry return value Greg KH
2009-10-01 23:31 ` [patch 23/30] netfilter: nf_nat: fix inverted logic for persistent NAT mappings Greg KH
2009-10-01 23:31 ` [patch 24/30] Fix idle time field in /proc/uptime Greg KH
2009-10-01 23:31 ` [patch 25/30] hugetlb: restore interleaving of bootmem huge pages (2.6.31) Greg KH
2009-10-01 23:31 ` [patch 26/30] powerpc/8xx: Fix regression introduced by cache coherency rewrite Greg KH
2009-10-01 23:31 ` [patch 27/30] powerpc: Fix incorrect setting of __HAVE_ARCH_PTE_SPECIAL Greg KH
2009-10-01 23:31 ` [patch 28/30] /proc/kcore: work around a BUG() Greg KH
2009-10-01 23:31 ` Greg KH [this message]
2009-10-01 23:31 ` [patch 30/30] PM / yenta: Fix cardbus suspend/resume regression Greg KH
2009-10-02 2:43 ` [patch 00/30] 2.6.30.9-stable review Henrique de Moraes Holschuh
2009-10-02 14:20 ` [stable] " Greg KH
2009-10-03 14:39 ` Henrique de Moraes Holschuh
2009-10-02 16:42 ` [31/30] thinkpad-acpi: fix incorrect use of TPACPI_BRGHT_MODE_ECNVRAM Greg KH
2009-10-02 17:20 ` [patch 32/30] mm: fix anonymous dirtying Greg KH
2009-10-02 17:21 ` [patch 33/30] mmap: avoid unnecessary anon_vma lock acquisition in vma_adjust() Greg KH
2009-10-02 17:23 ` [patch 00/30] 2.6.30.9-stable review Greg KH
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=20091001233323.116532896@mini.kroah.org \
--to=gregkh@suse.de \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=rjw@sisk.pl \
--cc=stable-review@kernel.org \
--cc=stable@kernel.org \
--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
all inboxes | Powered by JetHome®