From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jason Gunthorpe Subject: Re: [PATCH v2 06/16] tpm-chip: utilize new cdev_device_add helper function Date: Mon, 27 Feb 2017 09:42:09 -0700 Message-ID: <20170227164209.GD5891@obsidianresearch.com> References: <1488091097-12328-1-git-send-email-logang@deltatee.com> <1488091097-12328-7-git-send-email-logang@deltatee.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <1488091097-12328-7-git-send-email-logang-OTvnGxWRz7hWk0Htik3J/w@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-nvdimm-bounces-hn68Rpc1hR1g9hUCZPvPmw@public.gmane.org Sender: "Linux-nvdimm" To: Logan Gunthorpe Cc: Alessandro Zummo , Jan Kara , linux-iio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Linus Walleij , Jarkko Sakkinen , Alexandre Bounine , Alexandre Belloni , Peter Meerwald-Stadler , linux-scsi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Sean Hefty , Parav Pandit , Peter Huewe , Alexandre Courbot , Lars-Peter Clausen , "James E.J. Bottomley" , rtc-linux-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org, Leon Romanovsky , linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Richard Weinberger , Marek Vasut , Doug Ledford , Hans Verkuil , Matt Porter List-Id: linux-input@vger.kernel.org On Sat, Feb 25, 2017 at 11:38:07PM -0700, Logan Gunthorpe wrote: > Replace the open coded registration of the cdev and dev with the > new device_add_cdev() helper. The helper replaces a common pattern by > taking the proper reference against the parent device and adding both > the cdev and the device. > > Signed-off-by: Logan Gunthorpe > drivers/char/tpm/tpm-chip.c | 19 +++---------------- > 1 file changed, 3 insertions(+), 16 deletions(-) > > diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c > index a77262d..933f96e 100644 > +++ b/drivers/char/tpm/tpm-chip.c > @@ -187,7 +187,6 @@ struct tpm_chip *tpm_chip_alloc(struct device *dev, > > cdev_init(&chip->cdev, &tpm_fops); > chip->cdev.owner = THIS_MODULE; > - chip->cdev.kobj.parent = &chip->dev.kobj; > > return chip; > > @@ -230,27 +229,16 @@ static int tpm_add_char_device(struct tpm_chip *chip) > { > int rc; > > - rc = cdev_add(&chip->cdev, chip->dev.devt, 1); > + rc = cdev_device_add(&chip->cdev, &chip->dev); > if (rc) { > dev_err(&chip->dev, > - "unable to cdev_add() %s, major %d, minor %d, err=%d\n", > + "unable to cdev_device_add() %s, major %d, minor %d, err=%d\n", > dev_name(&chip->dev), MAJOR(chip->dev.devt), > MINOR(chip->dev.devt), rc); > > return rc; > } > > - rc = device_add(&chip->dev); > - if (rc) { > - dev_err(&chip->dev, > - "unable to device_register() %s, major %d, minor %d, err=%d\n", > - dev_name(&chip->dev), MAJOR(chip->dev.devt), > - MINOR(chip->dev.devt), rc); > - > - cdev_del(&chip->cdev); > - return rc; > - } This will collide with the patch I sent: https://patchwork.kernel.org/patch/9589001/ Jarkko: The resolution will be to continue to call tpm_del_char_device from the cdev_device_add error path and drop all calls to cdev_del Reviewed-by: Jason Gunthorpe Jason