seq/proc: modify seq_put_decimal_[u]ll to take a const char *, not char

[cascardo/linux.git] / drivers / xen / platform-pci.c

diff --git a/drivers/xen/platform-pci.c b/drivers/xen/platform-pci.c
index cf96666..b59c945 100644 (file)
--- a/drivers/xen/platform-pci.c
+++ b/drivers/xen/platform-pci.c
@@ -42,7 +42,6 @@
 static unsigned long platform_mmio;
 static unsigned long platform_mmio_alloc;
 static unsigned long platform_mmiolen;
-static uint64_t callback_via;
 
 static unsigned long alloc_xen_mmio(unsigned long len)
 {
@@ -55,51 +54,6 @@ static unsigned long alloc_xen_mmio(unsigned long len)
        return addr;
 }
 
-static uint64_t get_callback_via(struct pci_dev *pdev)
-{
-       u8 pin;
-       int irq;
-
-       irq = pdev->irq;
-       if (irq < 16)
-               return irq; /* ISA IRQ */
-
-       pin = pdev->pin;
-
-       /* We don't know the GSI. Specify the PCI INTx line instead. */
-       return ((uint64_t)0x01 << 56) | /* PCI INTx identifier */
-               ((uint64_t)pci_domain_nr(pdev->bus) << 32) |
-               ((uint64_t)pdev->bus->number << 16) |
-               ((uint64_t)(pdev->devfn & 0xff) << 8) |
-               ((uint64_t)(pin - 1) & 3);
-}
-
-static irqreturn_t do_hvm_evtchn_intr(int irq, void *dev_id)
-{
-       xen_hvm_evtchn_do_upcall();
-       return IRQ_HANDLED;
-}
-
-static int xen_allocate_irq(struct pci_dev *pdev)
-{
-       return request_irq(pdev->irq, do_hvm_evtchn_intr,
-                       IRQF_NOBALANCING | IRQF_TRIGGER_RISING,
-                       "xen-platform-pci", pdev);
-}
-
-static int platform_pci_resume(struct pci_dev *pdev)
-{
-       int err;
-       if (xen_have_vector_callback)
-               return 0;
-       err = xen_set_callback_via(callback_via);
-       if (err) {
-               dev_err(&pdev->dev, "platform_pci_resume failure!\n");
-               return err;
-       }
-       return 0;
-}
-
 static int platform_pci_probe(struct pci_dev *pdev,
                              const struct pci_device_id *ent)
 {
@@ -138,21 +92,6 @@ static int platform_pci_probe(struct pci_dev *pdev,
        platform_mmio = mmio_addr;
        platform_mmiolen = mmio_len;
 
-       if (!xen_have_vector_callback) {
-               ret = xen_allocate_irq(pdev);
-               if (ret) {
-                       dev_warn(&pdev->dev, "request_irq failed err=%d\n", ret);
-                       goto out;
-               }
-               callback_via = get_callback_via(pdev);
-               ret = xen_set_callback_via(callback_via);
-               if (ret) {
-                       dev_warn(&pdev->dev, "Unable to set the evtchn callback "
-                                        "err=%d\n", ret);
-                       goto out;
-               }
-       }
-
        max_nr_gframes = gnttab_max_grant_frames();
        grant_frames = alloc_xen_mmio(PAGE_SIZE * max_nr_gframes);
        ret = gnttab_setup_auto_xlat_frames(grant_frames);
@@ -184,9 +123,6 @@ static struct pci_driver platform_driver = {
        .name =           DRV_NAME,
        .probe =          platform_pci_probe,
        .id_table =       platform_pci_tbl,
-#ifdef CONFIG_PM
-       .resume_early =   platform_pci_resume,
-#endif
 };
 
 static int __init platform_pci_init(void)