git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
pcmcia
/
pd6729.c
diff --git
a/drivers/pcmcia/pd6729.c
b/drivers/pcmcia/pd6729.c
index
f2789af
..
360c248
100644
(file)
--- a/
drivers/pcmcia/pd6729.c
+++ b/
drivers/pcmcia/pd6729.c
@@
-8,7
+8,6
@@
*/
#include <linux/kernel.h>
*/
#include <linux/kernel.h>
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/init.h>
@@
-183,7
+182,7
@@
static void indirect_write16(struct pd6729_socket *socket, unsigned short reg,
/* Interrupt handler functionality */
/* Interrupt handler functionality */
-static irqreturn_t pd6729_interrupt(int irq, void *dev
, struct pt_regs *regs
)
+static irqreturn_t pd6729_interrupt(int irq, void *dev)
{
struct pd6729_socket *socket = (struct pd6729_socket *)dev;
int i;
{
struct pd6729_socket *socket = (struct pd6729_socket *)dev;
int i;
@@
-250,7
+249,7
@@
static void pd6729_interrupt_wrapper(unsigned long data)
{
struct pd6729_socket *socket = (struct pd6729_socket *) data;
{
struct pd6729_socket *socket = (struct pd6729_socket *) data;
- pd6729_interrupt(0, (void *)socket
, NULL
);
+ pd6729_interrupt(0, (void *)socket);
mod_timer(&socket->poll_timer, jiffies + HZ);
}
mod_timer(&socket->poll_timer, jiffies + HZ);
}
@@
-576,21
+575,21
@@
static struct pccard_operations pd6729_operations = {
.set_mem_map = pd6729_set_mem_map,
};
.set_mem_map = pd6729_set_mem_map,
};
-static irqreturn_t pd6729_test(int irq, void *dev
, struct pt_regs *regs
)
+static irqreturn_t pd6729_test(int irq, void *dev)
{
dprintk("-> hit on irq %d\n", irq);
return IRQ_HANDLED;
}
{
dprintk("-> hit on irq %d\n", irq);
return IRQ_HANDLED;
}
-static int pd6729_check_irq(int irq
, int flags
)
+static int pd6729_check_irq(int irq)
{
{
- if (request_irq(irq, pd6729_test,
flags, "x", pd6729_test) != 0
)
- return -1;
+ if (request_irq(irq, pd6729_test,
IRQF_PROBE_SHARED, "x", pd6729_test
)
+
!= 0)
return -1;
free_irq(irq, pd6729_test);
return 0;
}
free_irq(irq, pd6729_test);
return 0;
}
-static u_int __init pd6729_isa_scan(void)
+static u_int __
dev
init pd6729_isa_scan(void)
{
u_int mask0, mask = 0;
int i;
{
u_int mask0, mask = 0;
int i;
@@
-611,7
+610,7
@@
static u_int __init pd6729_isa_scan(void)
/* just find interrupts that aren't in use */
for (i = 0; i < 16; i++)
/* just find interrupts that aren't in use */
for (i = 0; i < 16; i++)
- if ((mask0 & (1 << i)) && (pd6729_check_irq(i
, 0
) == 0))
+ if ((mask0 & (1 << i)) && (pd6729_check_irq(i) == 0))
mask |= (1 << i);
printk(KERN_INFO "pd6729: ISA irqs = ");
mask |= (1 << i);
printk(KERN_INFO "pd6729: ISA irqs = ");
@@
-643,7
+642,8
@@
static int __devinit pd6729_pci_probe(struct pci_dev *dev,
goto err_out_free_mem;
printk(KERN_INFO "pd6729: Cirrus PD6729 PCI to PCMCIA Bridge "
goto err_out_free_mem;
printk(KERN_INFO "pd6729: Cirrus PD6729 PCI to PCMCIA Bridge "
- "at 0x%lx on irq %d\n", pci_resource_start(dev, 0), dev->irq);
+ "at 0x%llx on irq %d\n",
+ (unsigned long long)pci_resource_start(dev, 0), dev->irq);
/*
* Since we have no memory BARs some firmware may not
* have had PCI_COMMAND_MEMORY enabled, yet the device needs it.
/*
* Since we have no memory BARs some firmware may not
* have had PCI_COMMAND_MEMORY enabled, yet the device needs it.
@@
-689,7
+689,7
@@
static int __devinit pd6729_pci_probe(struct pci_dev *dev,
pci_set_drvdata(dev, socket);
if (irq_mode == 1) {
/* Register the interrupt handler */
pci_set_drvdata(dev, socket);
if (irq_mode == 1) {
/* Register the interrupt handler */
- if ((ret = request_irq(dev->irq, pd6729_interrupt,
SA_SHIRQ
,
+ if ((ret = request_irq(dev->irq, pd6729_interrupt,
IRQF_SHARED
,
"pd6729", socket))) {
printk(KERN_ERR "pd6729: Failed to register irq %d, "
"aborting\n", dev->irq);
"pd6729", socket))) {
printk(KERN_ERR "pd6729: Failed to register irq %d, "
"aborting\n", dev->irq);
@@
-755,6
+755,7
@@
static void __devexit pd6729_pci_remove(struct pci_dev *dev)
kfree(socket);
}
kfree(socket);
}
+#ifdef CONFIG_PM
static int pd6729_socket_suspend(struct pci_dev *dev, pm_message_t state)
{
return pcmcia_socket_dev_suspend(&dev->dev, state);
static int pd6729_socket_suspend(struct pci_dev *dev, pm_message_t state)
{
return pcmcia_socket_dev_suspend(&dev->dev, state);
@@
-764,6
+765,7
@@
static int pd6729_socket_resume(struct pci_dev *dev)
{
return pcmcia_socket_dev_resume(&dev->dev);
}
{
return pcmcia_socket_dev_resume(&dev->dev);
}
+#endif
static struct pci_device_id pd6729_pci_ids[] = {
{
static struct pci_device_id pd6729_pci_ids[] = {
{
@@
-781,8
+783,10
@@
static struct pci_driver pd6729_pci_drv = {
.id_table = pd6729_pci_ids,
.probe = pd6729_pci_probe,
.remove = __devexit_p(pd6729_pci_remove),
.id_table = pd6729_pci_ids,
.probe = pd6729_pci_probe,
.remove = __devexit_p(pd6729_pci_remove),
+#ifdef CONFIG_PM
.suspend = pd6729_socket_suspend,
.resume = pd6729_socket_resume,
.suspend = pd6729_socket_suspend,
.resume = pd6729_socket_resume,
+#endif
};
static int pd6729_module_init(void)
};
static int pd6729_module_init(void)