diff for duplicates of <200802190104.47058.bzolnier@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 224fa19..85ca18e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,48 +1,55 @@ On Monday 18 February 2008, Kamalesh Babulal wrote: > Hi, -> +>=20 > The next-20080218 kernel build fails on the powerpc(s) -> -> drivers/ide/ppc/pmac.c: In function ‘pmac_ide_macio_attach’: -> drivers/ide/ppc/pmac.c:1094: error: conversion to non-scalar type requested -> drivers/ide/ppc/pmac.c: In function ‘pmac_ide_pci_attach’: -> drivers/ide/ppc/pmac.c:1232: error: conversion to non-scalar type requested +>=20 +> drivers/ide/ppc/pmac.c: In function =E2=80=98pmac_ide_macio_attach=E2=80= +=99: +> drivers/ide/ppc/pmac.c:1094: error: conversion to non-scalar type request= +ed +> drivers/ide/ppc/pmac.c: In function =E2=80=98pmac_ide_pci_attach=E2=80=99: +> drivers/ide/ppc/pmac.c:1232: error: conversion to non-scalar type request= +ed > make[3]: *** [drivers/ide/ppc/pmac.o] Error 1 > make[2]: *** [drivers/ide/ppc] Error 2 > make[1]: *** [drivers/ide] Error 2 > make: *** [drivers] Error 2 -> +>=20 > I Have tested this patch for build failure only. -> +>=20 > Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> > --- -> --- linux-2.6.25-rc1/drivers/ide/ppc/pmac.c 2008-02-18 18:41:48.000000000 +0530 -> +++ linux-2.6.25-rc1/drivers/ide/ppc/~pmac.c 2008-02-18 19:20:37.000000000 +0530 +> --- linux-2.6.25-rc1/drivers/ide/ppc/pmac.c 2008-02-18 18:41:48.000000000= + +0530 +> +++ linux-2.6.25-rc1/drivers/ide/ppc/~pmac.c 2008-02-18 19:20:37.00000000= +0 +0530 > @@ -1091,7 +1091,7 @@ pmac_ide_macio_attach(struct macio_dev * > int irq, rc; > hw_regs_t hw; -> -> - pmif = (struct pmac_ide_hwif)kzalloc(sizeof(*pmif), GFP_KERNEL); -> + pmif = (struct pmac_ide_hwif*)kzalloc(sizeof(*pmif), GFP_KERNEL); -> if (pmif == NULL) +> =20 +> - pmif =3D (struct pmac_ide_hwif)kzalloc(sizeof(*pmif), GFP_KERNEL); +> + pmif =3D (struct pmac_ide_hwif*)kzalloc(sizeof(*pmif), GFP_KERNEL); +> if (pmif =3D=3D NULL) > return -ENOMEM; -> +> =20 > @@ -1229,7 +1229,7 @@ pmac_ide_pci_attach(struct pci_dev *pdev > return -ENODEV; > } -> -> - pmif = (struct pmac_ide_hwif)kzalloc(sizeof(*pmif), GFP_KERNEL); -> + pmif = (struct pmac_ide_hwif*)kzalloc(sizeof(*pmif), GFP_KERNEL); -> if (pmif == NULL) +> =20 +> - pmif =3D (struct pmac_ide_hwif)kzalloc(sizeof(*pmif), GFP_KERNEL); +> + pmif =3D (struct pmac_ide_hwif*)kzalloc(sizeof(*pmif), GFP_KERNEL); +> if (pmif =3D=3D NULL) > return -ENOMEM; -> +> =20 Thanks, I integrated it with the "guilty" patch to preserve bisectability. -From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> -Subject: [PATCH] ide-pmac: dynamically allocate struct pmac_ide_hwif instances (take 2) +=46rom: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> +Subject: [PATCH] ide-pmac: dynamically allocate struct pmac_ide_hwif instan= +ces (take 2) -* Dynamically allocate struct pmac_ide_hwif instances in pmac_ide_macio_attach() +* Dynamically allocate struct pmac_ide_hwif instances in pmac_ide_macio_att= +ach() and pmac_ide_pci_attach(), then remove no longer needed pmac_ide[]. v2: @@ -51,138 +58,142 @@ v2: Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> ---- - drivers/ide/ppc/pmac.c | 49 +++++++++++++++++++++++++++++++++---------------- +=2D-- + drivers/ide/ppc/pmac.c | 49 +++++++++++++++++++++++++++++++++-----------= +=2D---- 1 file changed, 33 insertions(+), 16 deletions(-) Index: b/drivers/ide/ppc/pmac.c -=================================================================== ---- a/drivers/ide/ppc/pmac.c +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +=2D-- a/drivers/ide/ppc/pmac.c +++ b/drivers/ide/ppc/pmac.c @@ -79,8 +79,6 @@ typedef struct pmac_ide_hwif { - + =09 } pmac_ide_hwif_t; - --static pmac_ide_hwif_t pmac_ide[MAX_HWIFS]; -- +=20 +=2Dstatic pmac_ide_hwif_t pmac_ide[MAX_HWIFS]; +=2D enum { controller_ohare, /* OHare based */ controller_heathrow, /* Heathrow/Paddington */ @@ -1094,29 +1092,34 @@ pmac_ide_macio_attach(struct macio_dev * int i, rc; hw_regs_t hw; - -+ pmif = kzalloc(sizeof(*pmif), GFP_KERNEL); -+ if (pmif == NULL) +=20 ++ pmif =3D kzalloc(sizeof(*pmif), GFP_KERNEL); ++ if (pmif =3D=3D NULL) + return -ENOMEM; + - i = 0; -- while (i < MAX_HWIFS && (ide_hwifs[i].io_ports[IDE_DATA_OFFSET] != 0 -- || pmac_ide[i].node != NULL)) -+ while (i < MAX_HWIFS && (ide_hwifs[i].io_ports[IDE_DATA_OFFSET] != 0)) + i =3D 0; +=2D while (i < MAX_HWIFS && (ide_hwifs[i].io_ports[IDE_DATA_OFFSET] !=3D 0 +=2D || pmac_ide[i].node !=3D NULL)) ++ while (i < MAX_HWIFS && (ide_hwifs[i].io_ports[IDE_DATA_OFFSET] !=3D 0)) ++i; - if (i >= MAX_HWIFS) { + if (i >=3D MAX_HWIFS) { printk(KERN_ERR "ide-pmac: MacIO interface attach with no slot\n"); printk(KERN_ERR " %s\n", mdev->ofdev.node->full_name); -- return -ENODEV; -+ rc = -ENODEV; +=2D return -ENODEV; ++ rc =3D -ENODEV; + goto out_free_pmif; } - -- pmif = &pmac_ide[i]; - hwif = &ide_hwifs[i]; - - if (macio_resource_count(mdev) == 0) { +=20 +=2D pmif =3D &pmac_ide[i]; + hwif =3D &ide_hwifs[i]; +=20 + if (macio_resource_count(mdev) =3D=3D 0) { printk(KERN_WARNING "ide%d: no address for %s\n", i, mdev->ofdev.node->full_name); -- return -ENXIO; -+ rc = -ENXIO; +=2D return -ENXIO; ++ rc =3D -ENXIO; + goto out_free_pmif; } - +=20 /* Request memory resource for IO ports */ if (macio_request_resource(mdev, 0, "ide-pmac (ports)")) { printk(KERN_ERR "ide%d: can't request mmio resource !\n", i); -- return -EBUSY; -+ rc = -EBUSY; +=2D return -EBUSY; ++ rc =3D -EBUSY; + goto out_free_pmif; } - + =09 /* XXX This is bogus. Should be fixed in the registry by checking @@ -1166,11 +1169,15 @@ pmac_ide_macio_attach(struct macio_dev * iounmap(pmif->dma_regs); macio_release_resource(mdev, 1); } -- memset(pmif, 0, sizeof(*pmif)); +=2D memset(pmif, 0, sizeof(*pmif)); macio_release_resource(mdev, 0); + kfree(pmif); } - +=20 return rc; + +out_free_pmif: + kfree(pmif); + return rc; } - +=20 static int @@ -1223,30 +1230,36 @@ pmac_ide_pci_attach(struct pci_dev *pdev - printk(KERN_ERR "ide-pmac: cannot find MacIO node for Kauai ATA interface\n"); + printk(KERN_ERR "ide-pmac: cannot find MacIO node for Kauai ATA interfac= +e\n"); return -ENODEV; } + -+ pmif = kzalloc(sizeof(*pmif), GFP_KERNEL); -+ if (pmif == NULL) ++ pmif =3D kzalloc(sizeof(*pmif), GFP_KERNEL); ++ if (pmif =3D=3D NULL) + return -ENOMEM; + - i = 0; -- while (i < MAX_HWIFS && (ide_hwifs[i].io_ports[IDE_DATA_OFFSET] != 0 -- || pmac_ide[i].node != NULL)) -+ while (i < MAX_HWIFS && (ide_hwifs[i].io_ports[IDE_DATA_OFFSET] != 0)) + i =3D 0; +=2D while (i < MAX_HWIFS && (ide_hwifs[i].io_ports[IDE_DATA_OFFSET] !=3D 0 +=2D || pmac_ide[i].node !=3D NULL)) ++ while (i < MAX_HWIFS && (ide_hwifs[i].io_ports[IDE_DATA_OFFSET] !=3D 0)) ++i; - if (i >= MAX_HWIFS) { + if (i >=3D MAX_HWIFS) { printk(KERN_ERR "ide-pmac: PCI interface attach with no slot\n"); printk(KERN_ERR " %s\n", np->full_name); -- return -ENODEV; -+ rc = -ENODEV; +=2D return -ENODEV; ++ rc =3D -ENODEV; + goto out_free_pmif; } - -- pmif = &pmac_ide[i]; - hwif = &ide_hwifs[i]; - +=20 +=2D pmif =3D &pmac_ide[i]; + hwif =3D &ide_hwifs[i]; +=20 if (pci_enable_device(pdev)) { printk(KERN_WARNING "ide%i: Can't enable PCI device for %s\n", i, np->full_name); -- return -ENXIO; -+ rc = -ENXIO; +=2D return -ENXIO; ++ rc =3D -ENXIO; + goto out_free_pmif; } pci_set_master(pdev); - + =09 if (pci_request_regions(pdev, "Kauai ATA")) { printk(KERN_ERR "ide%d: Cannot obtain PCI resources for %s\n", i, np->full_name); -- return -ENXIO; -+ rc = -ENXIO; +=2D return -ENXIO; ++ rc =3D -ENXIO; + goto out_free_pmif; } - - hwif->dev = &pdev->dev; +=20 + hwif->dev =3D &pdev->dev; @@ -1276,11 +1289,15 @@ pmac_ide_pci_attach(struct pci_dev *pdev /* The inteface is released to the common IDE layer */ pci_set_drvdata(pdev, NULL); iounmap(base); -- memset(pmif, 0, sizeof(*pmif)); +=2D memset(pmif, 0, sizeof(*pmif)); pci_release_regions(pdev); + kfree(pmif); } - +=20 return rc; + +out_free_pmif: + kfree(pmif); + return rc; } - +=20 static int diff --git a/a/content_digest b/N1/content_digest index 60e85e1..255cd98 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,58 +3,64 @@ "Subject\0Re: [PATCH] next-20080218 build failure at pmac_ide_macio_attach ()\0" "Date\0Tue, 19 Feb 2008 01:04:46 +0100\0" "To\0Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>\0" - "Cc\0linux-kernel@vger.kernel.org" - linux-ide@vger.kernel.org - linuxppc-dev@ozlabs.org + "Cc\0linux-ide@vger.kernel.org" sfr@canb.auug.org.au - " apw@shadowen.org\0" + linux-kernel@vger.kernel.org + " linuxppc-dev@ozlabs.org\0" "\00:1\0" "b\0" "On Monday 18 February 2008, Kamalesh Babulal wrote:\n" "> Hi,\n" - "> \n" + ">=20\n" "> The next-20080218 kernel build fails on the powerpc(s)\n" - "> \n" - "> drivers/ide/ppc/pmac.c: In function \342\200\230pmac_ide_macio_attach\342\200\231:\n" - "> drivers/ide/ppc/pmac.c:1094: error: conversion to non-scalar type requested\n" - "> drivers/ide/ppc/pmac.c: In function \342\200\230pmac_ide_pci_attach\342\200\231:\n" - "> drivers/ide/ppc/pmac.c:1232: error: conversion to non-scalar type requested\n" + ">=20\n" + "> drivers/ide/ppc/pmac.c: In function =E2=80=98pmac_ide_macio_attach=E2=80=\n" + "=99:\n" + "> drivers/ide/ppc/pmac.c:1094: error: conversion to non-scalar type request=\n" + "ed\n" + "> drivers/ide/ppc/pmac.c: In function =E2=80=98pmac_ide_pci_attach=E2=80=99:\n" + "> drivers/ide/ppc/pmac.c:1232: error: conversion to non-scalar type request=\n" + "ed\n" "> make[3]: *** [drivers/ide/ppc/pmac.o] Error 1\n" "> make[2]: *** [drivers/ide/ppc] Error 2\n" "> make[1]: *** [drivers/ide] Error 2\n" "> make: *** [drivers] Error 2\n" - "> \n" + ">=20\n" "> I Have tested this patch for build failure only.\n" - "> \n" + ">=20\n" "> Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>\n" "> ---\n" - "> --- linux-2.6.25-rc1/drivers/ide/ppc/pmac.c\t2008-02-18 18:41:48.000000000 +0530\n" - "> +++ linux-2.6.25-rc1/drivers/ide/ppc/~pmac.c\t2008-02-18 19:20:37.000000000 +0530\n" + "> --- linux-2.6.25-rc1/drivers/ide/ppc/pmac.c\t2008-02-18 18:41:48.000000000=\n" + " +0530\n" + "> +++ linux-2.6.25-rc1/drivers/ide/ppc/~pmac.c\t2008-02-18 19:20:37.00000000=\n" + "0 +0530\n" "> @@ -1091,7 +1091,7 @@ pmac_ide_macio_attach(struct macio_dev *\n" "> \tint irq, rc;\n" "> \thw_regs_t hw;\n" - "> \n" - "> -\tpmif = (struct pmac_ide_hwif)kzalloc(sizeof(*pmif), GFP_KERNEL);\n" - "> +\tpmif = (struct pmac_ide_hwif*)kzalloc(sizeof(*pmif), GFP_KERNEL);\n" - "> \tif (pmif == NULL)\n" + "> =20\n" + "> -\tpmif =3D (struct pmac_ide_hwif)kzalloc(sizeof(*pmif), GFP_KERNEL);\n" + "> +\tpmif =3D (struct pmac_ide_hwif*)kzalloc(sizeof(*pmif), GFP_KERNEL);\n" + "> \tif (pmif =3D=3D NULL)\n" "> \t\treturn -ENOMEM;\n" - "> \n" + "> =20\n" "> @@ -1229,7 +1229,7 @@ pmac_ide_pci_attach(struct pci_dev *pdev\n" "> \t\treturn -ENODEV;\n" "> \t}\n" - "> \n" - "> -\tpmif = (struct pmac_ide_hwif)kzalloc(sizeof(*pmif), GFP_KERNEL);\n" - "> +\tpmif = (struct pmac_ide_hwif*)kzalloc(sizeof(*pmif), GFP_KERNEL);\n" - "> \tif (pmif == NULL)\n" + "> =20\n" + "> -\tpmif =3D (struct pmac_ide_hwif)kzalloc(sizeof(*pmif), GFP_KERNEL);\n" + "> +\tpmif =3D (struct pmac_ide_hwif*)kzalloc(sizeof(*pmif), GFP_KERNEL);\n" + "> \tif (pmif =3D=3D NULL)\n" "> \t\treturn -ENOMEM;\n" - "> \n" + "> =20\n" "\n" "Thanks, I integrated it with the \"guilty\" patch to preserve bisectability.\n" "\n" - "From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>\n" - "Subject: [PATCH] ide-pmac: dynamically allocate struct pmac_ide_hwif instances (take 2)\n" + "=46rom: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>\n" + "Subject: [PATCH] ide-pmac: dynamically allocate struct pmac_ide_hwif instan=\n" + "ces (take 2)\n" "\n" - "* Dynamically allocate struct pmac_ide_hwif instances in pmac_ide_macio_attach()\n" + "* Dynamically allocate struct pmac_ide_hwif instances in pmac_ide_macio_att=\n" + "ach()\n" " and pmac_ide_pci_attach(), then remove no longer needed pmac_ide[].\n" "\n" "v2:\n" @@ -63,140 +69,144 @@ "Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>\n" "Cc: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>\n" "Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>\n" - "---\n" - " drivers/ide/ppc/pmac.c | 49 +++++++++++++++++++++++++++++++++----------------\n" + "=2D--\n" + " drivers/ide/ppc/pmac.c | 49 +++++++++++++++++++++++++++++++++-----------=\n" + "=2D----\n" " 1 file changed, 33 insertions(+), 16 deletions(-)\n" "\n" "Index: b/drivers/ide/ppc/pmac.c\n" - "===================================================================\n" - "--- a/drivers/ide/ppc/pmac.c\n" + "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" + "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" + "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n" + "=2D-- a/drivers/ide/ppc/pmac.c\n" "+++ b/drivers/ide/ppc/pmac.c\n" "@@ -79,8 +79,6 @@ typedef struct pmac_ide_hwif {\n" - " \t\n" + " =09\n" " } pmac_ide_hwif_t;\n" - " \n" - "-static pmac_ide_hwif_t pmac_ide[MAX_HWIFS];\n" - "-\n" + "=20\n" + "=2Dstatic pmac_ide_hwif_t pmac_ide[MAX_HWIFS];\n" + "=2D\n" " enum {\n" " \tcontroller_ohare,\t/* OHare based */\n" " \tcontroller_heathrow,\t/* Heathrow/Paddington */\n" "@@ -1094,29 +1092,34 @@ pmac_ide_macio_attach(struct macio_dev *\n" " \tint i, rc;\n" " \thw_regs_t hw;\n" - " \n" - "+\tpmif = kzalloc(sizeof(*pmif), GFP_KERNEL);\n" - "+\tif (pmif == NULL)\n" + "=20\n" + "+\tpmif =3D kzalloc(sizeof(*pmif), GFP_KERNEL);\n" + "+\tif (pmif =3D=3D NULL)\n" "+\t\treturn -ENOMEM;\n" "+\n" - " \ti = 0;\n" - "-\twhile (i < MAX_HWIFS && (ide_hwifs[i].io_ports[IDE_DATA_OFFSET] != 0\n" - "-\t || pmac_ide[i].node != NULL))\n" - "+\twhile (i < MAX_HWIFS && (ide_hwifs[i].io_ports[IDE_DATA_OFFSET] != 0))\n" + " \ti =3D 0;\n" + "=2D\twhile (i < MAX_HWIFS && (ide_hwifs[i].io_ports[IDE_DATA_OFFSET] !=3D 0\n" + "=2D\t || pmac_ide[i].node !=3D NULL))\n" + "+\twhile (i < MAX_HWIFS && (ide_hwifs[i].io_ports[IDE_DATA_OFFSET] !=3D 0))\n" " \t\t++i;\n" - " \tif (i >= MAX_HWIFS) {\n" + " \tif (i >=3D MAX_HWIFS) {\n" " \t\tprintk(KERN_ERR \"ide-pmac: MacIO interface attach with no slot\\n\");\n" " \t\tprintk(KERN_ERR \" %s\\n\", mdev->ofdev.node->full_name);\n" - "-\t\treturn -ENODEV;\n" - "+\t\trc = -ENODEV;\n" + "=2D\t\treturn -ENODEV;\n" + "+\t\trc =3D -ENODEV;\n" "+\t\tgoto out_free_pmif;\n" " \t}\n" - " \n" - "-\tpmif = &pmac_ide[i];\n" - " \thwif = &ide_hwifs[i];\n" - " \n" - " \tif (macio_resource_count(mdev) == 0) {\n" + "=20\n" + "=2D\tpmif =3D &pmac_ide[i];\n" + " \thwif =3D &ide_hwifs[i];\n" + "=20\n" + " \tif (macio_resource_count(mdev) =3D=3D 0) {\n" " \t\tprintk(KERN_WARNING \"ide%d: no address for %s\\n\",\n" " \t\t i, mdev->ofdev.node->full_name);\n" - "-\t\treturn -ENXIO;\n" - "+\t\trc = -ENXIO;\n" + "=2D\t\treturn -ENXIO;\n" + "+\t\trc =3D -ENXIO;\n" "+\t\tgoto out_free_pmif;\n" " \t}\n" - " \n" + "=20\n" " \t/* Request memory resource for IO ports */\n" " \tif (macio_request_resource(mdev, 0, \"ide-pmac (ports)\")) {\n" " \t\tprintk(KERN_ERR \"ide%d: can't request mmio resource !\\n\", i);\n" - "-\t\treturn -EBUSY;\n" - "+\t\trc = -EBUSY;\n" + "=2D\t\treturn -EBUSY;\n" + "+\t\trc =3D -EBUSY;\n" "+\t\tgoto out_free_pmif;\n" " \t}\n" - " \t\t\t\n" + " \t\t=09\n" " \t/* XXX This is bogus. Should be fixed in the registry by checking\n" "@@ -1166,11 +1169,15 @@ pmac_ide_macio_attach(struct macio_dev *\n" " \t\t\tiounmap(pmif->dma_regs);\n" " \t\t\tmacio_release_resource(mdev, 1);\n" " \t\t}\n" - "-\t\tmemset(pmif, 0, sizeof(*pmif));\n" + "=2D\t\tmemset(pmif, 0, sizeof(*pmif));\n" " \t\tmacio_release_resource(mdev, 0);\n" "+\t\tkfree(pmif);\n" " \t}\n" - " \n" + "=20\n" " \treturn rc;\n" "+\n" "+out_free_pmif:\n" "+\tkfree(pmif);\n" "+\treturn rc;\n" " }\n" - " \n" + "=20\n" " static int\n" "@@ -1223,30 +1230,36 @@ pmac_ide_pci_attach(struct pci_dev *pdev\n" - " \t\tprintk(KERN_ERR \"ide-pmac: cannot find MacIO node for Kauai ATA interface\\n\");\n" + " \t\tprintk(KERN_ERR \"ide-pmac: cannot find MacIO node for Kauai ATA interfac=\n" + "e\\n\");\n" " \t\treturn -ENODEV;\n" " \t}\n" "+\n" - "+\tpmif = kzalloc(sizeof(*pmif), GFP_KERNEL);\n" - "+\tif (pmif == NULL)\n" + "+\tpmif =3D kzalloc(sizeof(*pmif), GFP_KERNEL);\n" + "+\tif (pmif =3D=3D NULL)\n" "+\t\treturn -ENOMEM;\n" "+\n" - " \ti = 0;\n" - "-\twhile (i < MAX_HWIFS && (ide_hwifs[i].io_ports[IDE_DATA_OFFSET] != 0\n" - "-\t || pmac_ide[i].node != NULL))\n" - "+\twhile (i < MAX_HWIFS && (ide_hwifs[i].io_ports[IDE_DATA_OFFSET] != 0))\n" + " \ti =3D 0;\n" + "=2D\twhile (i < MAX_HWIFS && (ide_hwifs[i].io_ports[IDE_DATA_OFFSET] !=3D 0\n" + "=2D\t || pmac_ide[i].node !=3D NULL))\n" + "+\twhile (i < MAX_HWIFS && (ide_hwifs[i].io_ports[IDE_DATA_OFFSET] !=3D 0))\n" " \t\t++i;\n" - " \tif (i >= MAX_HWIFS) {\n" + " \tif (i >=3D MAX_HWIFS) {\n" " \t\tprintk(KERN_ERR \"ide-pmac: PCI interface attach with no slot\\n\");\n" " \t\tprintk(KERN_ERR \" %s\\n\", np->full_name);\n" - "-\t\treturn -ENODEV;\n" - "+\t\trc = -ENODEV;\n" + "=2D\t\treturn -ENODEV;\n" + "+\t\trc =3D -ENODEV;\n" "+\t\tgoto out_free_pmif;\n" " \t}\n" - " \n" - "-\tpmif = &pmac_ide[i];\n" - " \thwif = &ide_hwifs[i];\n" - " \n" + "=20\n" + "=2D\tpmif =3D &pmac_ide[i];\n" + " \thwif =3D &ide_hwifs[i];\n" + "=20\n" " \tif (pci_enable_device(pdev)) {\n" " \t\tprintk(KERN_WARNING \"ide%i: Can't enable PCI device for %s\\n\",\n" " \t\t\ti, np->full_name);\n" - "-\t\treturn -ENXIO;\n" - "+\t\trc = -ENXIO;\n" + "=2D\t\treturn -ENXIO;\n" + "+\t\trc =3D -ENXIO;\n" "+\t\tgoto out_free_pmif;\n" " \t}\n" " \tpci_set_master(pdev);\n" - " \t\t\t\n" + " \t\t=09\n" " \tif (pci_request_regions(pdev, \"Kauai ATA\")) {\n" " \t\tprintk(KERN_ERR \"ide%d: Cannot obtain PCI resources for %s\\n\",\n" " \t\t\ti, np->full_name);\n" - "-\t\treturn -ENXIO;\n" - "+\t\trc = -ENXIO;\n" + "=2D\t\treturn -ENXIO;\n" + "+\t\trc =3D -ENXIO;\n" "+\t\tgoto out_free_pmif;\n" " \t}\n" - " \n" - " \thwif->dev = &pdev->dev;\n" + "=20\n" + " \thwif->dev =3D &pdev->dev;\n" "@@ -1276,11 +1289,15 @@ pmac_ide_pci_attach(struct pci_dev *pdev\n" " \t\t/* The inteface is released to the common IDE layer */\n" " \t\tpci_set_drvdata(pdev, NULL);\n" " \t\tiounmap(base);\n" - "-\t\tmemset(pmif, 0, sizeof(*pmif));\n" + "=2D\t\tmemset(pmif, 0, sizeof(*pmif));\n" " \t\tpci_release_regions(pdev);\n" "+\t\tkfree(pmif);\n" " \t}\n" - " \n" + "=20\n" " \treturn rc;\n" "+\n" "+out_free_pmif:\n" "+\tkfree(pmif);\n" "+\treturn rc;\n" " }\n" - " \n" + "=20\n" static int -303ddca7e6470258102b5a528ee9867534eb58101f42f1dec3772f345d0b5d71 +cbab942528401429bcffcb9977c40f9cbd7a233091bb1fb21164c077b8458bc2
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.