From patchwork Fri Feb 16 12:38:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 874399 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ide-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zjXkJ5fR2z9s7f for ; Fri, 16 Feb 2018 23:38:32 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967052AbeBPMib (ORCPT ); Fri, 16 Feb 2018 07:38:31 -0500 Received: from mout.web.de ([212.227.17.11]:46065 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966628AbeBPMia (ORCPT ); Fri, 16 Feb 2018 07:38:30 -0500 Received: from [192.168.1.2] ([77.182.211.116]) by smtp.web.de (mrweb101 [213.165.67.124]) with ESMTPSA (Nemesis) id 0LiCx5-1eQH0x3pjP-00nRta; Fri, 16 Feb 2018 13:38:21 +0100 Subject: [PATCH 1/3] pata_macio: Delete an error message for a failed memory allocation in two functions From: SF Markus Elfring To: linux-ide@vger.kernel.org, Bartlomiej Zolnierkiewicz , Tejun Heo Cc: LKML , kernel-janitors@vger.kernel.org References: <1e87cf7d-eda2-12d9-af01-17f6619cda72@users.sourceforge.net> Message-ID: <0e764e7d-98cf-7f4e-91ff-bf82aa381442@users.sourceforge.net> Date: Fri, 16 Feb 2018 13:38:20 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <1e87cf7d-eda2-12d9-af01-17f6619cda72@users.sourceforge.net> Content-Language: en-US X-Provags-ID: V03:K0:0skjKZAEiZovk6HaRT456I83tJA8MUM33YG9BD0nLkKzrCmI72M Hw1ifQYP+P2bM96vwvfk14BkMBYAAGWnU96ntwkiKz2QS6sFa5J6KNf/kH8N+MPjkf6Jitm ZR/EgCFu/wVBsdla4gEs3wB/elCddWFJYMPcoT3Lp7H11AXXMN39R7SxjVIy3TwQrQRU5Y0 bEE8cOb50/FggsN1POc2Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:nhHWUdH1bio=:PTEM78wzEY8DlvOFApWStn Ux5aqoK/SRi8ExfMKARPo17P85quPtC/ETr5otUR/dYd19UfjusdAO0m5krvCSK4uyONccF9J e/ImcuSMZFn7f/++qNzJ5NNj7CRDslc3rJUGb9vgAWCC3by9y/7XAjjRXqMh/qa1M6sxYekC3 F2D7pfZDvj7rtCyWjFRGh3+UA3RIb36mlBrrdbv7GiCnIY9t2YA1qBZ2hPmMUftUQr8aueYY7 G/6SskLmuhZ74Q+yEoulcm6E2eLAEgxYtbHEVN7yRPiAhZQgIF2lgfgNZN4ZcOQxgONagrwpx QaLuPsdR6wJJ+BrxHRiQGpH+IUq5rtVyQ9MYQn8otmDcmYsCxv75+S7ZSbvhXcscDpopiDWCj 2QieCeUC/nb0dkdI0TmG9Rx0UOWzoYPwWkcuDZRouE+12EqfvPPBs6zcrX3QXAScp7xC+32WX nYXxPfxVHAPj8Rak5AxbnsXv52hc5q/uaOCJalpnwqc2HR1iT36XDiKWUxlBfckawHlo6xkDk MLFGnw6TD5LiNOGDWxARomVqWWfrgfaBNUBhLVMS+72WyUrxqhS0yFJzFEmZTVDmHRquqUL8t gXSViWZNS3fKVOfKv+CHeucx4uK8ZfOFxKnXmYyS/lbH4/cywPGN7VmbX6Q9hNqy0R8kF/Vtm BZNvbKtXHuHuhGhWIn0Vi+VBhXD4tF9YiNBuTqKKcXxCxaz8jzst6UO5377u+PlvwBXuOq51n l6zA6rc3PUJaXn6Uy7ZGrkm0x6s5WO+gBjKkjRlAEYoB7973TtIy9MXag7DJV6jKzNHIVzzSs HW+QF9ocZN+ACdS/WbC9PyACVjS8hdtD/f2dZpSOCTpv80R32w= Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From: Markus Elfring Date: Fri, 16 Feb 2018 13:01:45 +0100 Omit an extra message for a memory allocation failure in these functions. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/ata/pata_macio.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/ata/pata_macio.c b/drivers/ata/pata_macio.c index 0adcb40d2794..9588e685d994 100644 --- a/drivers/ata/pata_macio.c +++ b/drivers/ata/pata_macio.c @@ -1131,11 +1131,9 @@ static int pata_macio_attach(struct macio_dev *mdev, /* Allocate and init private data structure */ priv = devm_kzalloc(&mdev->ofdev.dev, sizeof(struct pata_macio_priv), GFP_KERNEL); - if (priv == NULL) { - dev_err(&mdev->ofdev.dev, - "Failed to allocate private memory\n"); + if (!priv) return -ENOMEM; - } + priv->node = of_node_get(mdev->ofdev.dev.of_node); priv->mdev = mdev; priv->dev = &mdev->ofdev.dev; @@ -1277,11 +1275,9 @@ static int pata_macio_pci_attach(struct pci_dev *pdev, /* Allocate and init private data structure */ priv = devm_kzalloc(&pdev->dev, sizeof(struct pata_macio_priv), GFP_KERNEL); - if (priv == NULL) { - dev_err(&pdev->dev, - "Failed to allocate private memory\n"); + if (!priv) return -ENOMEM; - } + priv->node = of_node_get(np); priv->pdev = pdev; priv->dev = &pdev->dev; From patchwork Fri Feb 16 12:39:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 874405 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ide-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zjXm02SV2z9s7f for ; Fri, 16 Feb 2018 23:40:00 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967159AbeBPMjq (ORCPT ); Fri, 16 Feb 2018 07:39:46 -0500 Received: from mout.web.de ([212.227.17.11]:35589 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967151AbeBPMjp (ORCPT ); Fri, 16 Feb 2018 07:39:45 -0500 Received: from [192.168.1.2] ([77.182.211.116]) by smtp.web.de (mrweb101 [213.165.67.124]) with ESMTPSA (Nemesis) id 0MBkPj-1eu85v0lpH-00AnHn; Fri, 16 Feb 2018 13:39:36 +0100 Subject: [PATCH 2/3] pata_macio: Improve a size determination in two functions From: SF Markus Elfring To: linux-ide@vger.kernel.org, Bartlomiej Zolnierkiewicz , Tejun Heo Cc: LKML , kernel-janitors@vger.kernel.org References: <1e87cf7d-eda2-12d9-af01-17f6619cda72@users.sourceforge.net> Message-ID: <44765718-d832-c58b-6055-91c7c9b11b73@users.sourceforge.net> Date: Fri, 16 Feb 2018 13:39:35 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <1e87cf7d-eda2-12d9-af01-17f6619cda72@users.sourceforge.net> Content-Language: en-US X-Provags-ID: V03:K0:SCvE2UaWrJniAtcJEurDR4YblgI0CBHZBJb1UZomcIf4ST2HQIk 4GmyUseJgkQ2r5bGfDF3IlI0gP+5KmsCnaQpeKaX6gSRg6DSqQnxBMPsRzKL1M4QDBV/Nlb T9Q9/7rX3elXexHk7BINqrtAB+XaQJ0oZA77qBaUIViAyB7OMZlnIu3+FAV44l+6OhBts4b wEhSD1qDAidTzpGkXNJTg== X-UI-Out-Filterresults: notjunk:1; V01:K0:G+Y49GT9jyk=:9LlPEvB/XeJC0eKe2nPGM1 PLtHvPAoSNsxVfE83DpyOMeNnmrUoBejmaTeF/4eFV07Qe6oTx5cz1/4lOOppFY1VKCpn/EcP PFSFYGY0tYiW9QufXAg03kO8VhcyOzmLita1f6ldQYbXV3nIVD9REncvowOdb3x+PDKpKGVWi WcBy89iSi4mX9Uu1+1QwYiaaHpNFUjhm7GV/TAHmnHJzBU4iV4x6Kf0xjSXOCWoAGzUaFR1L9 2nAaVO3L1iFQO++cc8p6V9lYDsTJFeTOTnqDjjOpX+8kLk896oIXayJFaWWoNXwcKyNZ1uvE6 H7M4UMjcHIvN8urdWDjJzBXHWUU5M7v9fUTme1yVLzDb/hzvgFtQqWfHhfv5rMKs1EbrA4MlH lSwjNtRx1rALQU45rY4m3YNo+Ma6czmQvm8Es/+Cz333/hP3oQjGNv7wAuh9+JyJHirpIFpDt 3vnStFJEG7lvLowfrd0cfKelidBjOPXfvJ/9ZhW1PJU8qWAB6zpYsxCUc4q482IFZey+4u8su v2qQAPIVvtYykZKFxGvhOTWFJqLJeTpr7aAhrSmxaJ7bqBmwU0dhKd5+iJZxjthW3i3bmqo4Z wNLtOSl3CAzdAok4SGtVpG8/pqcxOeHTs7tPtm63EfRH99naHRmdCnvLFKcIFCVvoHwWaxjfp yjE3pdRPsqNtAEkORzJWKf8k+G1zY1eRvbdAgjtQ2CVSRbbkEK+p+KUpOvuHFH8FtOAgnMKUA OvT3/q585JbrP/7uSRomaam+U1gki68TmqCvyz00lsG4pKilExWlTk6UYdAG2p3vo0WBVvWER ogbEXsP3vjQbXtDuuThxEkCq9Id4syXcGozOWrgqyx0Q/cINzs= Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From: Markus Elfring Date: Fri, 16 Feb 2018 13:08:14 +0100 Replace the specification of data structures by pointer dereferences as the parameter for the operator "sizeof" to make the corresponding size determination a bit safer according to the Linux coding style convention. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/ata/pata_macio.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/ata/pata_macio.c b/drivers/ata/pata_macio.c index 9588e685d994..dc40af4c615c 100644 --- a/drivers/ata/pata_macio.c +++ b/drivers/ata/pata_macio.c @@ -1129,8 +1129,7 @@ static int pata_macio_attach(struct macio_dev *mdev, macio_enable_devres(mdev); /* Allocate and init private data structure */ - priv = devm_kzalloc(&mdev->ofdev.dev, - sizeof(struct pata_macio_priv), GFP_KERNEL); + priv = devm_kzalloc(&mdev->ofdev.dev, sizeof(*priv), GFP_KERNEL); if (!priv) return -ENOMEM; @@ -1273,8 +1272,7 @@ static int pata_macio_pci_attach(struct pci_dev *pdev, } /* Allocate and init private data structure */ - priv = devm_kzalloc(&pdev->dev, - sizeof(struct pata_macio_priv), GFP_KERNEL); + priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); if (!priv) return -ENOMEM; From patchwork Fri Feb 16 12:40:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 874406 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ide-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zjXnB5Dfjz9t3M for ; Fri, 16 Feb 2018 23:41:02 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967274AbeBPMkr (ORCPT ); Fri, 16 Feb 2018 07:40:47 -0500 Received: from mout.web.de ([212.227.17.12]:51653 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967151AbeBPMkp (ORCPT ); Fri, 16 Feb 2018 07:40:45 -0500 Received: from [192.168.1.2] ([77.182.211.116]) by smtp.web.de (mrweb103 [213.165.67.124]) with ESMTPSA (Nemesis) id 0MdLo7-1f3vBR0UNv-00IW0h; Fri, 16 Feb 2018 13:40:34 +0100 Subject: [PATCH 3/3] pata_macio: Adjust 11 checks for null pointers From: SF Markus Elfring To: linux-ide@vger.kernel.org, Bartlomiej Zolnierkiewicz , Tejun Heo Cc: LKML , kernel-janitors@vger.kernel.org References: <1e87cf7d-eda2-12d9-af01-17f6619cda72@users.sourceforge.net> Message-ID: <046bc8ef-c7b3-91ed-8fbc-1609a80c4c7b@users.sourceforge.net> Date: Fri, 16 Feb 2018 13:40:33 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <1e87cf7d-eda2-12d9-af01-17f6619cda72@users.sourceforge.net> Content-Language: en-US X-Provags-ID: V03:K0:PBq58ZovjaUdlJaJxZLF3vzDs7fpWoH6H7suPSLzzVUml23obee fkp0gMS7UC/P8phYq0YiKzqPZ3Or4H2HvMVFp6SHwcJGTYVu/hO91YKMFyekMXs4PZjx7Jw t0BKFaWsmStYdGJwcyFyN4F2fyUscFCCbFegnQF9+40Kt4p8LUMbIKsgB7t0sg+HJjHiGF9 wHNFacaZH28Fcq4Ak50xQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:uz68HJyo5CU=:Rqhdlut1uhSDy9Hapr2wXX AxjW+5okxtDDV04QG99g60mPxDseVqpgh3QqlVc28BUYqtTW3yGkQeT6VSsmmkOGmvoegOhIF 8CdVJpYqpor5OlvhBeQTzWkY1z+WUhr+O6jIQKr/5U5/JKFNHMNmb2KtqhGjMRWyf95Ys3XRj Q86t7Tn03KEpizr/X2e0Klw8535KzFQumeryzVTDFREz/6/m0G514oG2dW6gvd7OJ8nKHUtNF f1fYaSsiXsQVSr2eDdO9PREC2chdZG2Tu7MhNZ9OMKEEhuMp6VWDLqIIDZMCwzKWXQn2pcl5I nLR0zBmDYmINzsOK7IE1lN7boDJfL7b9eWLZXUVB9trbq9tge3JrGprHa47s7+jgCKsk40JYy MF0m43+DoqNnOG6YNzoJ+FbrvFn+CsSIR2MrEg0RzpUJQUOKMv64+CKHCxYEzfFV15ZZJuPA0 /nhSUsySFDxmXLKnXsVb2wObCUkgxS0JErTS1H5fq6X8hdh2f7D9gU4U3zBZ7/i7U1rUlTDWa 5EjczUbPC3qhGyCmQ7U7hAOy0xj7EnRzAEtbaCUk2pWc/NDgNro99xh0NSwFzoKQOP0mgpmLw +pUv0t58Xtr3TOJnbHu1MGqw/x4QKPm+cs/kKldD0Pbb/OUEFylNvPxAITi/pF0DS4DBdvciL jAgA6gyR8GMOnfN9d4RTbSV24FxkeFkLQHLFTK+zEQ9piYPjgAUVFZ5WKt+mxFwAfJ8rAZGyf eJ24JBo2qGDKcpS5DvDxwQ7Mc5ud19k1DJFhKm/efMZCUWCyQ1crb07HJZ42Oh3PQFZBP8DIv dFWeoAchdFQ37/n2LMc8A3M6wsXucBYLhkfzxXiF4DOVRwwd/o= Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From: Markus Elfring Date: Fri, 16 Feb 2018 13:20:03 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The script “checkpatch.pl” pointed information out like the following. Comparison to NULL could be written !… Thus fix the affected source code places. Signed-off-by: Markus Elfring --- drivers/ata/pata_macio.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/ata/pata_macio.c b/drivers/ata/pata_macio.c index dc40af4c615c..04d546d672c0 100644 --- a/drivers/ata/pata_macio.c +++ b/drivers/ata/pata_macio.c @@ -405,23 +405,23 @@ static void pata_macio_set_timings(struct ata_port *ap, /* Now get the PIO timings */ t = pata_macio_find_timing(priv, adev->pio_mode); - if (t == NULL) { + if (!t) { dev_warn(priv->dev, "Invalid PIO timing requested: 0x%x\n", adev->pio_mode); t = pata_macio_find_timing(priv, XFER_PIO_0); } - BUG_ON(t == NULL); + BUG_ON(!t); /* PIO timings only ever use the first treg */ priv->treg[adev->devno][0] |= t->reg1; /* Now get DMA timings */ t = pata_macio_find_timing(priv, adev->dma_mode); - if (t == NULL || (t->reg1 == 0 && t->reg2 == 0)) { + if (!t || (t->reg1 == 0 && t->reg2 == 0)) { dev_dbg(priv->dev, "DMA timing not set yet, using MW_DMA_0\n"); t = pata_macio_find_timing(priv, XFER_MW_DMA_0); } - BUG_ON(t == NULL); + BUG_ON(!t); /* DMA timings can use both tregs */ priv->treg[adev->devno][0] |= t->reg1; @@ -705,7 +705,7 @@ static int pata_macio_port_start(struct ata_port *ap) { struct pata_macio_priv *priv = ap->private_data; - if (ap->ioaddr.bmdma_addr == NULL) + if (!ap->ioaddr.bmdma_addr) return 0; /* Allocate space for the DBDMA commands. @@ -717,7 +717,7 @@ static int pata_macio_port_start(struct ata_port *ap) dmam_alloc_coherent(priv->dev, (MAX_DCMDS + 2) * sizeof(struct dbdma_cmd), &priv->dma_table_dma, GFP_KERNEL); - if (priv->dma_table_cpu == NULL) { + if (!priv->dma_table_cpu) { dev_err(priv->dev, "Unable to allocate DMA command list\n"); ap->ioaddr.bmdma_addr = NULL; ap->mwdma_mask = 0; @@ -1055,7 +1055,7 @@ static int pata_macio_common_init(struct pata_macio_priv *priv, pinfo.private_data = priv; priv->host = ata_host_alloc_pinfo(priv->dev, ppi, 1); - if (priv->host == NULL) { + if (!priv->host) { dev_err(priv->dev, "Failed to allocate ATA port structure\n"); return -ENOMEM; } @@ -1065,7 +1065,7 @@ static int pata_macio_common_init(struct pata_macio_priv *priv, /* Map base registers */ priv->tfregs = devm_ioremap(priv->dev, tfregs, 0x100); - if (priv->tfregs == NULL) { + if (!priv->tfregs) { dev_err(priv->dev, "Failed to map ATA ports\n"); return -ENOMEM; } @@ -1075,14 +1075,14 @@ static int pata_macio_common_init(struct pata_macio_priv *priv, if (dmaregs != 0) { dma_regs = devm_ioremap(priv->dev, dmaregs, sizeof(struct dbdma_regs)); - if (dma_regs == NULL) + if (!dma_regs) dev_warn(priv->dev, "Failed to map ATA DMA registers\n"); } /* If chip has local feature control, map those regs too */ if (fcregs != 0) { priv->kauai_fcr = devm_ioremap(priv->dev, fcregs, 4); - if (priv->kauai_fcr == NULL) { + if (!priv->kauai_fcr) { dev_err(priv->dev, "Failed to map ATA FCR register\n"); return -ENOMEM; } @@ -1258,7 +1258,7 @@ static int pata_macio_pci_attach(struct pci_dev *pdev, /* We cannot use a MacIO controller without its OF device node */ np = pci_device_to_OF_node(pdev); - if (np == NULL) { + if (!np) { dev_err(&pdev->dev, "Cannot find OF device node for controller\n"); return -ENODEV;