misc: Removed warnings from MAX1749 driver
[linux-2.6.git] / drivers / misc / tifm_7xx1.c
index 67503ea..ba24790 100644 (file)
@@ -11,6 +11,7 @@
 
 #include <linux/tifm.h>
 #include <linux/dma-mapping.h>
+#include <linux/module.h>
 
 #define DRIVER_NAME "tifm_7xx1"
 #define DRIVER_VERSION "0.8"
@@ -164,7 +165,7 @@ static void tifm_7xx1_switch_media(struct work_struct *work)
                if (sock) {
                        printk(KERN_INFO
                               "%s : demand removing card from socket %u:%u\n",
-                              fm->dev.bus_id, fm->id, cnt);
+                              dev_name(&fm->dev), fm->id, cnt);
                        fm->sockets[cnt] = NULL;
                        sock_addr = sock->addr;
                        spin_unlock_irqrestore(&fm->lock, flags);
@@ -324,7 +325,7 @@ static int tifm_7xx1_probe(struct pci_dev *dev,
        int pci_dev_busy = 0;
        int rc;
 
-       rc = pci_set_dma_mask(dev, DMA_32BIT_MASK);
+       rc = pci_set_dma_mask(dev, DMA_BIT_MASK(32));
        if (rc)
                return rc;
 
@@ -354,8 +355,7 @@ static int tifm_7xx1_probe(struct pci_dev *dev,
        fm->has_ms_pif = tifm_7xx1_has_ms_pif;
        pci_set_drvdata(dev, fm);
 
-       fm->addr = ioremap(pci_resource_start(dev, 0),
-                          pci_resource_len(dev, 0));
+       fm->addr = pci_ioremap_bar(dev, 0);
        if (!fm->addr)
                goto err_out_free;