Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933207AbaAaSYo (ORCPT ); Fri, 31 Jan 2014 13:24:44 -0500 Received: from mail-la0-f48.google.com ([209.85.215.48]:33318 "EHLO mail-la0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933192AbaAaSYm (ORCPT ); Fri, 31 Jan 2014 13:24:42 -0500 Message-ID: <52EBF885.30309@cogentembedded.com> Date: Fri, 31 Jan 2014 22:24:53 +0300 From: Sergei Shtylyov Organization: Cogent Embedded User-Agent: Mozilla/5.0 (X11; Linux i686; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: Alexander Gordeev , linux-kernel@vger.kernel.org CC: Hyong-Youb Kim , netdev@vger.kernel.org, linux-pci@vger.kernel.org Subject: Re: [PATCH 20/34] myri10ge: Use pci_enable_msix_range() References: <1253b3c920637ab6bb987defb88d1698ac1e4851.1391172839.git.agordeev@redhat.com> In-Reply-To: <1253b3c920637ab6bb987defb88d1698ac1e4851.1391172839.git.agordeev@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello. On 01/31/2014 06:08 PM, Alexander Gordeev wrote: > As result of deprecation of MSI-X/MSI enablement functions > pci_enable_msix() and pci_enable_msi_block() all drivers > using these two interfaces need to be updated to use the > new pci_enable_msi_range() and pci_enable_msix_range() > interfaces. > Signed-off-by: Alexander Gordeev > --- > drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 32 ++++++++++----------- > 1 files changed, 15 insertions(+), 17 deletions(-) > diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c > index 68026f7..9f717d6 100644 > --- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c > +++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c > @@ -2329,16 +2329,14 @@ static int myri10ge_request_irq(struct myri10ge_priv *mgp) > status = 0; > if (myri10ge_msi) { > if (mgp->num_slices > 1) { > - status = > - pci_enable_msix(pdev, mgp->msix_vectors, > - mgp->num_slices); > - if (status == 0) { > - mgp->msix_enabled = 1; > - } else { > + status = pci_enable_msix_range(pdev, mgp->msix_vectors, > + mgp->num_slices, mgp->num_slices); > + if (status < 0) { > dev_err(&pdev->dev, > "Error %d setting up MSI-X\n", status); > return status; > } > + mgp->msix_enabled = 1; > } > if (mgp->msix_enabled == 0) { > status = pci_enable_msi(pdev); > @@ -3901,23 +3899,23 @@ static void myri10ge_probe_slices(struct myri10ge_priv *mgp) > } > > while (mgp->num_slices > 1) { > - /* make sure it is a power of two */ > - while (!is_power_of_2(mgp->num_slices)) > - mgp->num_slices--; > + mgp->num_slices = rounddown_pow_of_two(mgp->num_slices); > if (mgp->num_slices == 1) > goto disable_msix; > - status = pci_enable_msix(pdev, mgp->msix_vectors, > - mgp->num_slices); > - if (status == 0) { > - pci_disable_msix(pdev); > + status = pci_enable_msix_range(pdev, mgp->msix_vectors, > + mgp->num_slices, mgp->num_slices); The continuation line(s) should be aligned to start right under 'pdev', according to the networking coding rules. > + if (status < 0) > + goto disable_msix; Hm, if enabling MSI failed, we don't need to disable it, right? So, perhaps the label should be renamed? > + > + pci_disable_msix(pdev); > + > + if (status == mgp->num_slices) { > if (old_allocated) > kfree(old_fw); > return; > - } > - if (status > 0) > + } else { > mgp->num_slices = status; > - else > - goto disable_msix; > + } > } > > disable_msix: WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/