summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
58b022a)
Managed API eliminates error handling code, thus reduces several lines
of code.
Signed-off-by: PrasannaKumar Muralidharan <prasannatsmkumar@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
struct amd768_priv {
void __iomem *iobase;
struct pci_dev *pcidev;
struct amd768_priv {
void __iomem *iobase;
struct pci_dev *pcidev;
};
static int amd_rng_read(struct hwrng *rng, void *buf, size_t max, bool wait)
};
static int amd_rng_read(struct hwrng *rng, void *buf, size_t max, bool wait)
if (pmbase == 0)
return -EIO;
if (pmbase == 0)
return -EIO;
- priv = kzalloc(sizeof(*priv), GFP_KERNEL);
- if (!priv)
- return -ENOMEM;
+ priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
+ if (IS_ERR(priv))
+ return PTR_ERR(priv);
- if (!request_region(pmbase + PMBASE_OFFSET, PMBASE_SIZE, DRV_NAME)) {
+ if (!devm_request_region(&pdev->dev, pmbase + PMBASE_OFFSET,
+ PMBASE_SIZE, DRV_NAME)) {
dev_err(&pdev->dev, DRV_NAME " region 0x%x already in use!\n",
pmbase + 0xF0);
dev_err(&pdev->dev, DRV_NAME " region 0x%x already in use!\n",
pmbase + 0xF0);
- err = -EBUSY;
- goto out;
- priv->iobase = ioport_map(pmbase + PMBASE_OFFSET, PMBASE_SIZE);
- if (!priv->iobase) {
+ priv->iobase = devm_ioport_map(&pdev->dev, pmbase + PMBASE_OFFSET,
+ PMBASE_SIZE);
+ if (IS_ERR(priv->iobase)) {
pr_err(DRV_NAME "Cannot map ioport\n");
pr_err(DRV_NAME "Cannot map ioport\n");
- err = -EINVAL;
- goto err_iomap;
+ return PTR_ERR(priv->iobase);
}
amd_rng.priv = (unsigned long)priv;
}
amd_rng.priv = (unsigned long)priv;
priv->pcidev = pdev;
pr_info(DRV_NAME " detected\n");
priv->pcidev = pdev;
pr_info(DRV_NAME " detected\n");
- err = hwrng_register(&amd_rng);
- if (err) {
- pr_err(DRV_NAME " registering failed (%d)\n", err);
- goto err_hwrng;
- }
- return 0;
-
-err_hwrng:
- ioport_unmap(priv->iobase);
-err_iomap:
- release_region(pmbase + PMBASE_OFFSET, PMBASE_SIZE);
-out:
- kfree(priv);
- return err;
+ return devm_hwrng_register(&pdev->dev, &amd_rng);
}
static void __exit mod_exit(void)
{
}
static void __exit mod_exit(void)
{
- struct amd768_priv *priv;
-
- priv = (struct amd768_priv *)amd_rng.priv;
-
- hwrng_unregister(&amd_rng);
-
- ioport_unmap(priv->iobase);
-
- release_region(priv->pmbase + PMBASE_OFFSET, PMBASE_SIZE);
-
- kfree(priv);