From patchwork Fri Sep 25 18:30:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin LABBE X-Patchwork-Id: 11800549 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A71F3112C for ; Fri, 25 Sep 2020 18:33:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 89E86221E5 for ; Fri, 25 Sep 2020 18:33:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="w+Ghivlp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730047AbgIYSdw (ORCPT ); Fri, 25 Sep 2020 14:33:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35476 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729783AbgIYSdv (ORCPT ); Fri, 25 Sep 2020 14:33:51 -0400 Received: from mail-pf1-x441.google.com (mail-pf1-x441.google.com [IPv6:2607:f8b0:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 91991C0613CE for ; Fri, 25 Sep 2020 11:33:51 -0700 (PDT) Received: by mail-pf1-x441.google.com with SMTP id z18so4027447pfg.0 for ; Fri, 25 Sep 2020 11:33:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=P7qkSkJYzDAlxMBmU/NPbl2KeJOU3g6WtyY+La0RA/4=; b=w+GhivlpXfTDhwn3vPYTmh2OA1kk2Sfja5xfWOST1L4zhQdO5NmjEo+zwi5hqcE03m sW80MG9dqqqH1e8AgXuoBQsBU4XnZCNnbX/oHzFmCiajo8yvTYrZ+RzFAvRF0rOP/ohA Oq+wbWHXX2anjvZ3bela+IrPODD2ZE+5nfBD84l8JmfYXjg1Wj3OjoPnqBqHf0Yrmzfm hfTuGtMYnILI4UCqLRJCtlYyhGerAQvlH/YXlRJDJeaIrC+1OsmumIwn7ZZFZ/7at2n9 e2s5HWhjZb2GS8LI7N1h44oSGEwO+uCDHMTKot1tZzm2TWMffUxwaAB8SiDqDxlXmUbi FImw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=P7qkSkJYzDAlxMBmU/NPbl2KeJOU3g6WtyY+La0RA/4=; b=Nmybh/F2CjrrnnGIi7D+0w01cE6pZWiwC1cYTQeapczzpJbRYKs4anbhTA4KZagMav Ep+yKo0w+P3C5ILfkcAi3LbEXnMia04asYY9wbybAyEYoM6AECkhlNVK99qpt0XGUN3E SKIKZTDtQN0cAWv+xX7hckzfUKgdEGufEZ1nCMNuxpUdqNx9DWJ3U+4NbdIMkBAQXIUN MnCsPSDq1XSSM7fz1Rd4mmxZLEuEuCOYtu7fe0Ly9j10n3Uj48KvjvQmLSy/r+uvbBGK 4C4HDCl4mIMHnCsqfuXp/8m9yZOfZI+pjIyl0bL/oCqOvZPBYJUH+QTYu1D2eI+whz4u Ak9g== X-Gm-Message-State: AOAM532xI9QzWQKVx6/SDv0LNp+JTE4sLbNQ8Qt9kPh9M+rn8167sfcU ERZ+JDq9oL5lSJ4l5QnBUY8tkg== X-Google-Smtp-Source: ABdhPJyZwzYc8iEvhjhcYe9XSf/hc3p3lgjmIh4hvWoOn/1fBt1JX1mueOh8rrQ5ElDNmmOw58LVAw== X-Received: by 2002:a63:4c4e:: with SMTP id m14mr202944pgl.199.1601058831197; Fri, 25 Sep 2020 11:33:51 -0700 (PDT) Received: from localhost.localdomain ([51.15.160.169]) by smtp.googlemail.com with ESMTPSA id r16sm2554546pjo.19.2020.09.25.11.33.45 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Sep 2020 11:33:50 -0700 (PDT) From: Corentin Labbe To: gregkh@linuxfoundation.org, mchehab@kernel.org, hverkuil@xs4all.nl, laurent.pinchart@ideasonboard.com Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, Corentin Labbe Subject: [PATCH RFT/RFC v2 26/47] staging: media: zoran: convert irq to pci irq Date: Fri, 25 Sep 2020 18:30:36 +0000 Message-Id: <1601058657-14042-27-git-send-email-clabbe@baylibre.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1601058657-14042-1-git-send-email-clabbe@baylibre.com> References: <1601058657-14042-1-git-send-email-clabbe@baylibre.com> Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org This patch convert zoran to pci_irq functions. Signed-off-by: Corentin Labbe --- drivers/staging/media/zoran/zoran_card.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/staging/media/zoran/zoran_card.c b/drivers/staging/media/zoran/zoran_card.c index 8be7f8f0a020..706b040f5baa 100644 --- a/drivers/staging/media/zoran/zoran_card.c +++ b/drivers/staging/media/zoran/zoran_card.c @@ -1015,7 +1015,7 @@ static void zoran_remove(struct pci_dev *pdev) zoran_set_pci_master(zr, 0); /* put chip into reset */ btwrite(0, ZR36057_SPGPPCR); - free_irq(zr->pci_dev->irq, zr); + pci_free_irq(zr->pci_dev, 0, zr); /* unmap and free memory */ dma_free_coherent(&zr->pci_dev->dev, BUZ_NUM_STAT_COM * sizeof(u32), zr->stat_com, zr->p_sc); iounmap(zr->zr36057_mem); @@ -1175,8 +1175,7 @@ static int zoran_probe(struct pci_dev *pdev, const struct pci_device_id *ent) goto zr_unreg; } - result = request_irq(zr->pci_dev->irq, zoran_irq, - IRQF_SHARED, ZR_DEVNAME(zr), zr); + result = pci_request_irq(pdev, 0, zoran_irq, NULL, zr, ZR_DEVNAME(zr)); if (result < 0) { if (result == -EINVAL) { pci_err(pdev, "%s - bad IRQ number or handler\n", __func__); @@ -1292,7 +1291,7 @@ static int zoran_probe(struct pci_dev *pdev, const struct pci_device_id *ent) zoran_unregister_i2c(zr); zr_free_irq: btwrite(0, ZR36057_SPGPPCR); - free_irq(zr->pci_dev->irq, zr); + pci_free_irq(zr->pci_dev, 0, zr); zr_unmap: iounmap(zr->zr36057_mem); zr_unreg: