Commit 30224b5e authored by navin patidar's avatar navin patidar Committed by Greg Kroah-Hartman

staging: rtl8192e: Remove pt_regs * irq handler parameter

struct pt_regs pointer is no longer passed as a irq handler
argument. and also remove unnecessary macros.
Signed-off-by: default avatarnavin patidar <navinp@cdac.in>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0472c989
...@@ -94,6 +94,7 @@ MODULE_DEVICE_TABLE(pci, rtl8192_pci_id_tbl); ...@@ -94,6 +94,7 @@ MODULE_DEVICE_TABLE(pci, rtl8192_pci_id_tbl);
static int rtl8192_pci_probe(struct pci_dev *pdev, static int rtl8192_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *id); const struct pci_device_id *id);
static void rtl8192_pci_disconnect(struct pci_dev *pdev); static void rtl8192_pci_disconnect(struct pci_dev *pdev);
static irqreturn_t rtl8192_interrupt(int irq, void *netdev);
static struct pci_driver rtl8192_pci_driver = { static struct pci_driver rtl8192_pci_driver = {
.name = DRV_NAME, /* Driver name */ .name = DRV_NAME, /* Driver name */
...@@ -1324,7 +1325,7 @@ static short rtl8192_init(struct net_device *dev) ...@@ -1324,7 +1325,7 @@ static short rtl8192_init(struct net_device *dev)
(unsigned long)dev); (unsigned long)dev);
rtl8192_irq_disable(dev); rtl8192_irq_disable(dev);
if (request_irq(dev->irq, (void *)rtl8192_interrupt_rsl, IRQF_SHARED, if (request_irq(dev->irq, rtl8192_interrupt, IRQF_SHARED,
dev->name, dev)) { dev->name, dev)) {
printk(KERN_ERR "Error allocating IRQ %d", dev->irq); printk(KERN_ERR "Error allocating IRQ %d", dev->irq);
return -1; return -1;
...@@ -2704,7 +2705,7 @@ static int rtl8192_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) ...@@ -2704,7 +2705,7 @@ static int rtl8192_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
} }
irqreturn_type rtl8192_interrupt(int irq, void *netdev, struct pt_regs *regs) irqreturn_t rtl8192_interrupt(int irq, void *netdev)
{ {
struct net_device *dev = (struct net_device *) netdev; struct net_device *dev = (struct net_device *) netdev;
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
......
...@@ -88,10 +88,6 @@ ...@@ -88,10 +88,6 @@
.subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID , \ .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID , \
.driver_data = (kernel_ulong_t)&(cfg) .driver_data = (kernel_ulong_t)&(cfg)
#define irqreturn_type irqreturn_t
#define rtl8192_interrupt(x, y, z) rtl8192_interrupt_rsl(x, y)
#define RTL_MAX_SCAN_SIZE 128 #define RTL_MAX_SCAN_SIZE 128
#define RTL_RATE_MAX 30 #define RTL_RATE_MAX 30
...@@ -1044,8 +1040,6 @@ void rtl8192_set_chan(struct net_device *dev, short ch); ...@@ -1044,8 +1040,6 @@ void rtl8192_set_chan(struct net_device *dev, short ch);
void check_rfctrl_gpio_timer(unsigned long data); void check_rfctrl_gpio_timer(unsigned long data);
void rtl8192_hw_wakeup_wq(void *data); void rtl8192_hw_wakeup_wq(void *data);
irqreturn_type rtl8192_interrupt(int irq, void *netdev, struct pt_regs *regs);
short rtl8192_pci_initdescring(struct net_device *dev); short rtl8192_pci_initdescring(struct net_device *dev);
void rtl8192_cancel_deferred_work(struct r8192_priv *priv); void rtl8192_cancel_deferred_work(struct r8192_priv *priv);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment