diff for duplicates of <20160413135444.4ab83cde@bbrezillon> diff --git a/a/1.txt b/N1/1.txt index 11c585f..036dc44 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,12 +1,14 @@ On Wed, 13 Apr 2016 11:48:05 +0200 -Rafał Miłecki <zajec5@gmail.com> wrote: +Rafa=C5=82 Mi=C5=82ecki <zajec5@gmail.com> wrote: > It also contains some minor related changes: > 1) Don't warn if kzalloc fails as it dumps stack on its own > 2) Use %pR format for displaying whole resource to avoid: -> warning: format ‘%08llx’ expects type ‘long long unsigned int’, but argument 2 has type ‘resource_size_t’ -> -> Signed-off-by: Rafał Miłecki <zajec5@gmail.com> +> warning: format =E2=80=98%08llx=E2=80=99 expects type =E2=80=98long long = +unsigned int=E2=80=99, but argument 2 has type =E2=80=98resource_size_t=E2= +=80=99 +>=20 +> Signed-off-by: Rafa=C5=82 Mi=C5=82ecki <zajec5@gmail.com> Applied with a slightly different commit message to avoid "Possible unwrapped commit description" checkpatch warning. @@ -20,67 +22,71 @@ Boris > --- > drivers/mtd/nand/pasemi_nand.c | 15 +++++++-------- > 1 file changed, 7 insertions(+), 8 deletions(-) -> -> diff --git a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nand.c +>=20 +> diff --git a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nan= +d.c > index 63fcb8c..5de7591 100644 > --- a/drivers/mtd/nand/pasemi_nand.c > +++ b/drivers/mtd/nand/pasemi_nand.c > @@ -92,8 +92,9 @@ int pasemi_device_ready(struct mtd_info *mtd) -> +> =20 > static int pasemi_nand_probe(struct platform_device *ofdev) > { -> + struct device *dev = &ofdev->dev; +> + struct device *dev =3D &ofdev->dev; > struct pci_dev *pdev; -> - struct device_node *np = ofdev->dev.of_node; -> + struct device_node *np = dev->of_node; +> - struct device_node *np =3D ofdev->dev.of_node; +> + struct device_node *np =3D dev->of_node; > struct resource res; > struct nand_chip *chip; -> int err = 0; -> @@ -107,13 +108,11 @@ static int pasemi_nand_probe(struct platform_device *ofdev) +> int err =3D 0; +> @@ -107,13 +108,11 @@ static int pasemi_nand_probe(struct platform_device= + *ofdev) > if (pasemi_nand_mtd) > return -ENODEV; -> +> =20 > - pr_debug("pasemi_nand at %pR\n", &res); > + dev_dbg(dev, "pasemi_nand at %pR\n", &res); -> +> =20 > /* Allocate memory for MTD device structure and private data */ -> chip = kzalloc(sizeof(struct nand_chip), GFP_KERNEL); +> chip =3D kzalloc(sizeof(struct nand_chip), GFP_KERNEL); > if (!chip) { > - printk(KERN_WARNING > - "Unable to allocate PASEMI NAND MTD device structure\n"); -> err = -ENOMEM; +> err =3D -ENOMEM; > goto out; > } -> @@ -121,7 +120,7 @@ static int pasemi_nand_probe(struct platform_device *ofdev) -> pasemi_nand_mtd = nand_to_mtd(chip); -> +> @@ -121,7 +120,7 @@ static int pasemi_nand_probe(struct platform_device *= +ofdev) +> pasemi_nand_mtd =3D nand_to_mtd(chip); +> =20 > /* Link the private data with the MTD structure */ -> - pasemi_nand_mtd->dev.parent = &ofdev->dev; -> + pasemi_nand_mtd->dev.parent = dev; -> -> chip->IO_ADDR_R = of_iomap(np, 0); -> chip->IO_ADDR_W = chip->IO_ADDR_R; -> @@ -163,13 +162,13 @@ static int pasemi_nand_probe(struct platform_device *ofdev) +> - pasemi_nand_mtd->dev.parent =3D &ofdev->dev; +> + pasemi_nand_mtd->dev.parent =3D dev; +> =20 +> chip->IO_ADDR_R =3D of_iomap(np, 0); +> chip->IO_ADDR_W =3D chip->IO_ADDR_R; +> @@ -163,13 +162,13 @@ static int pasemi_nand_probe(struct platform_device= + *ofdev) > } -> +> =20 > if (mtd_device_register(pasemi_nand_mtd, NULL, 0)) { > - printk(KERN_ERR "pasemi_nand: Unable to register MTD device\n"); > + dev_err(dev, "Unable to register MTD device\n"); -> err = -ENODEV; +> err =3D -ENODEV; > goto out_lpc; > } -> +> =20 > - printk(KERN_INFO "PA Semi NAND flash at %08llx, control at I/O %x\n", > - res.start, lpcctl); > + dev_info(dev, "PA Semi NAND flash at %pR, control at I/O %x\n", &res, > + lpcctl); -> +> =20 > return 0; -> +> =20 --- +--=20 Boris Brezillon, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com diff --git a/a/content_digest b/N1/content_digest index 373bb8a..f616936 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -16,14 +16,16 @@ "\00:1\0" "b\0" "On Wed, 13 Apr 2016 11:48:05 +0200\n" - "Rafa\305\202 Mi\305\202ecki <zajec5@gmail.com> wrote:\n" + "Rafa=C5=82 Mi=C5=82ecki <zajec5@gmail.com> wrote:\n" "\n" "> It also contains some minor related changes:\n" "> 1) Don't warn if kzalloc fails as it dumps stack on its own\n" "> 2) Use %pR format for displaying whole resource to avoid:\n" - "> warning: format \342\200\230%08llx\342\200\231 expects type \342\200\230long long unsigned int\342\200\231, but argument 2 has type \342\200\230resource_size_t\342\200\231\n" - "> \n" - "> Signed-off-by: Rafa\305\202 Mi\305\202ecki <zajec5@gmail.com>\n" + "> warning: format =E2=80=98%08llx=E2=80=99 expects type =E2=80=98long long =\n" + "unsigned int=E2=80=99, but argument 2 has type =E2=80=98resource_size_t=E2=\n" + "=80=99\n" + ">=20\n" + "> Signed-off-by: Rafa=C5=82 Mi=C5=82ecki <zajec5@gmail.com>\n" "\n" "Applied with a slightly different commit message to avoid \"Possible\n" "unwrapped commit description\" checkpatch warning.\n" @@ -37,69 +39,73 @@ "> ---\n" "> drivers/mtd/nand/pasemi_nand.c | 15 +++++++--------\n" "> 1 file changed, 7 insertions(+), 8 deletions(-)\n" - "> \n" - "> diff --git a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nand.c\n" + ">=20\n" + "> diff --git a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nan=\n" + "d.c\n" "> index 63fcb8c..5de7591 100644\n" "> --- a/drivers/mtd/nand/pasemi_nand.c\n" "> +++ b/drivers/mtd/nand/pasemi_nand.c\n" "> @@ -92,8 +92,9 @@ int pasemi_device_ready(struct mtd_info *mtd)\n" - "> \n" + "> =20\n" "> static int pasemi_nand_probe(struct platform_device *ofdev)\n" "> {\n" - "> +\tstruct device *dev = &ofdev->dev;\n" + "> +\tstruct device *dev =3D &ofdev->dev;\n" "> \tstruct pci_dev *pdev;\n" - "> -\tstruct device_node *np = ofdev->dev.of_node;\n" - "> +\tstruct device_node *np = dev->of_node;\n" + "> -\tstruct device_node *np =3D ofdev->dev.of_node;\n" + "> +\tstruct device_node *np =3D dev->of_node;\n" "> \tstruct resource res;\n" "> \tstruct nand_chip *chip;\n" - "> \tint err = 0;\n" - "> @@ -107,13 +108,11 @@ static int pasemi_nand_probe(struct platform_device *ofdev)\n" + "> \tint err =3D 0;\n" + "> @@ -107,13 +108,11 @@ static int pasemi_nand_probe(struct platform_device=\n" + " *ofdev)\n" "> \tif (pasemi_nand_mtd)\n" "> \t\treturn -ENODEV;\n" - "> \n" + "> =20\n" "> -\tpr_debug(\"pasemi_nand at %pR\\n\", &res);\n" "> +\tdev_dbg(dev, \"pasemi_nand at %pR\\n\", &res);\n" - "> \n" + "> =20\n" "> \t/* Allocate memory for MTD device structure and private data */\n" - "> \tchip = kzalloc(sizeof(struct nand_chip), GFP_KERNEL);\n" + "> \tchip =3D kzalloc(sizeof(struct nand_chip), GFP_KERNEL);\n" "> \tif (!chip) {\n" "> -\t\tprintk(KERN_WARNING\n" "> -\t\t \"Unable to allocate PASEMI NAND MTD device structure\\n\");\n" - "> \t\terr = -ENOMEM;\n" + "> \t\terr =3D -ENOMEM;\n" "> \t\tgoto out;\n" "> \t}\n" - "> @@ -121,7 +120,7 @@ static int pasemi_nand_probe(struct platform_device *ofdev)\n" - "> \tpasemi_nand_mtd = nand_to_mtd(chip);\n" - "> \n" + "> @@ -121,7 +120,7 @@ static int pasemi_nand_probe(struct platform_device *=\n" + "ofdev)\n" + "> \tpasemi_nand_mtd =3D nand_to_mtd(chip);\n" + "> =20\n" "> \t/* Link the private data with the MTD structure */\n" - "> -\tpasemi_nand_mtd->dev.parent = &ofdev->dev;\n" - "> +\tpasemi_nand_mtd->dev.parent = dev;\n" - "> \n" - "> \tchip->IO_ADDR_R = of_iomap(np, 0);\n" - "> \tchip->IO_ADDR_W = chip->IO_ADDR_R;\n" - "> @@ -163,13 +162,13 @@ static int pasemi_nand_probe(struct platform_device *ofdev)\n" + "> -\tpasemi_nand_mtd->dev.parent =3D &ofdev->dev;\n" + "> +\tpasemi_nand_mtd->dev.parent =3D dev;\n" + "> =20\n" + "> \tchip->IO_ADDR_R =3D of_iomap(np, 0);\n" + "> \tchip->IO_ADDR_W =3D chip->IO_ADDR_R;\n" + "> @@ -163,13 +162,13 @@ static int pasemi_nand_probe(struct platform_device=\n" + " *ofdev)\n" "> \t}\n" - "> \n" + "> =20\n" "> \tif (mtd_device_register(pasemi_nand_mtd, NULL, 0)) {\n" "> -\t\tprintk(KERN_ERR \"pasemi_nand: Unable to register MTD device\\n\");\n" "> +\t\tdev_err(dev, \"Unable to register MTD device\\n\");\n" - "> \t\terr = -ENODEV;\n" + "> \t\terr =3D -ENODEV;\n" "> \t\tgoto out_lpc;\n" "> \t}\n" - "> \n" + "> =20\n" "> -\tprintk(KERN_INFO \"PA Semi NAND flash at %08llx, control at I/O %x\\n\",\n" "> -\t res.start, lpcctl);\n" "> +\tdev_info(dev, \"PA Semi NAND flash at %pR, control at I/O %x\\n\", &res,\n" "> +\t\t lpcctl);\n" - "> \n" + "> =20\n" "> \treturn 0;\n" - "> \n" + "> =20\n" "\n" "\n" "\n" - "-- \n" + "--=20\n" "Boris Brezillon, Free Electrons\n" "Embedded Linux and Kernel engineering\n" http://free-electrons.com -616f1a09e5225929cb0dfac4bd41224dc77435f599a4e54745e1f791ee6267fc +4c4531db1424081922a10c1d0ba26b8160006c398b31ef37ada4368fc6ef952c
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.