Merge tag 'tty-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[sfrench/cifs-2.6.git] / drivers / net / can / sja1000 / ems_pci.c

diff --git a/drivers/net/can/sja1000/ems_pci.c b/drivers/net/can/sja1000/ems_pci.c
index 1aaedaf866f1e9070f6520b26de1bb1215f045fb..5bca719d61f5a42c93ba0ced913b04dd7188183e 100644 (file)
--- a/drivers/net/can/sja1000/ems_pci.c
+++ b/drivers/net/can/sja1000/ems_pci.c
@@ -143,7 +143,7 @@ static void ems_pci_v1_write_reg(const struct sja1000_priv *priv,
 
 static void ems_pci_v1_post_irq(const struct sja1000_priv *priv)
 {
-       struct ems_pci_card *card = (struct ems_pci_card *)priv->priv;
+       struct ems_pci_card *card = priv->priv;
 
        /* reset int flag of pita */
        writel(PITA2_ICR_INT0_EN | PITA2_ICR_INT0,
@@ -163,7 +163,7 @@ static void ems_pci_v2_write_reg(const struct sja1000_priv *priv,
 
 static void ems_pci_v2_post_irq(const struct sja1000_priv *priv)
 {
-       struct ems_pci_card *card = (struct ems_pci_card *)priv->priv;
+       struct ems_pci_card *card = priv->priv;
 
        writel(PLX_ICSR_ENA_CLR, card->conf_addr + PLX_ICSR);
 }
@@ -181,7 +181,7 @@ static void ems_pci_v3_write_reg(const struct sja1000_priv *priv,
 
 static void ems_pci_v3_post_irq(const struct sja1000_priv *priv)
 {
-       struct ems_pci_card *card = (struct ems_pci_card *)priv->priv;
+       struct ems_pci_card *card = priv->priv;
 
        writel(ASIX_LINTSR_INT0AC, card->conf_addr + ASIX_LINTSR);
 }