Commit 9c823921 authored by Phong Tran's avatar Phong Tran Committed by Kelsey Skunberg

ipw2x00: Fix -Wcast-function-type

BugLink: https://bugs.launchpad.net/bugs/1868627

[ Upstream commit ebd77feb ]

correct usage prototype of callback in tasklet_init().
Report by https://github.com/KSPP/linux/issues/20Signed-off-by: default avatarPhong Tran <tranmanphong@gmail.com>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: default avatarKelsey Skunberg <kelsey.skunberg@canonical.com>
parent cdbfd82b
...@@ -3213,8 +3213,9 @@ static void ipw2100_tx_send_data(struct ipw2100_priv *priv) ...@@ -3213,8 +3213,9 @@ static void ipw2100_tx_send_data(struct ipw2100_priv *priv)
} }
} }
static void ipw2100_irq_tasklet(struct ipw2100_priv *priv) static void ipw2100_irq_tasklet(unsigned long data)
{ {
struct ipw2100_priv *priv = (struct ipw2100_priv *)data;
struct net_device *dev = priv->net_dev; struct net_device *dev = priv->net_dev;
unsigned long flags; unsigned long flags;
u32 inta, tmp; u32 inta, tmp;
...@@ -6022,7 +6023,7 @@ static void ipw2100_rf_kill(struct work_struct *work) ...@@ -6022,7 +6023,7 @@ static void ipw2100_rf_kill(struct work_struct *work)
spin_unlock_irqrestore(&priv->low_lock, flags); spin_unlock_irqrestore(&priv->low_lock, flags);
} }
static void ipw2100_irq_tasklet(struct ipw2100_priv *priv); static void ipw2100_irq_tasklet(unsigned long data);
static const struct net_device_ops ipw2100_netdev_ops = { static const struct net_device_ops ipw2100_netdev_ops = {
.ndo_open = ipw2100_open, .ndo_open = ipw2100_open,
...@@ -6151,7 +6152,7 @@ static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev, ...@@ -6151,7 +6152,7 @@ static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev,
INIT_DELAYED_WORK(&priv->rf_kill, ipw2100_rf_kill); INIT_DELAYED_WORK(&priv->rf_kill, ipw2100_rf_kill);
INIT_DELAYED_WORK(&priv->scan_event, ipw2100_scan_event); INIT_DELAYED_WORK(&priv->scan_event, ipw2100_scan_event);
tasklet_init(&priv->irq_tasklet, (void (*)(unsigned long)) tasklet_init(&priv->irq_tasklet,
ipw2100_irq_tasklet, (unsigned long)priv); ipw2100_irq_tasklet, (unsigned long)priv);
/* NOTE: We do not start the deferred work for status checks yet */ /* NOTE: We do not start the deferred work for status checks yet */
......
...@@ -1968,8 +1968,9 @@ static void notify_wx_assoc_event(struct ipw_priv *priv) ...@@ -1968,8 +1968,9 @@ static void notify_wx_assoc_event(struct ipw_priv *priv)
wireless_send_event(priv->net_dev, SIOCGIWAP, &wrqu, NULL); wireless_send_event(priv->net_dev, SIOCGIWAP, &wrqu, NULL);
} }
static void ipw_irq_tasklet(struct ipw_priv *priv) static void ipw_irq_tasklet(unsigned long data)
{ {
struct ipw_priv *priv = (struct ipw_priv *)data;
u32 inta, inta_mask, handled = 0; u32 inta, inta_mask, handled = 0;
unsigned long flags; unsigned long flags;
int rc = 0; int rc = 0;
...@@ -10705,7 +10706,7 @@ static int ipw_setup_deferred_work(struct ipw_priv *priv) ...@@ -10705,7 +10706,7 @@ static int ipw_setup_deferred_work(struct ipw_priv *priv)
INIT_WORK(&priv->qos_activate, ipw_bg_qos_activate); INIT_WORK(&priv->qos_activate, ipw_bg_qos_activate);
#endif /* CONFIG_IPW2200_QOS */ #endif /* CONFIG_IPW2200_QOS */
tasklet_init(&priv->irq_tasklet, (void (*)(unsigned long)) tasklet_init(&priv->irq_tasklet,
ipw_irq_tasklet, (unsigned long)priv); ipw_irq_tasklet, (unsigned long)priv);
return ret; return ret;
......
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