From: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
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 <elfring@xxxxxxxxxxxxxxxxxxxxx>
---
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;
--
2.16.1
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
