github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-30 01:53:29 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

staging: sm750fb: Use pcim_enable_device()

Browse Source 
Devm_ functions allocate memory that is released when a driver
detaches.
Replace pci_enable_device with the managed pcim_enable_device
and remove corresponding pci_disable_device from probe and
suspend functions of a pci_dev.

Also, an unnecessary label has been removed by replacing it
with a direct return statement.

Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Amitoj Kaur Chawla 2016-02-28 21:22:00 +05:30 committed by Greg Kroah-Hartman
parent 677c507211
commit 13b79a0d88
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/staging/sm750fb/sm750.c
View File

@ -422,7 +422,6 @@ static int lynxfb_suspend(struct pci_dev *pdev, pm_message_t mesg)
return ret; return ret;
} }
pci_disable_device(pdev);
ret = pci_set_power_state(pdev, pci_choose_state(pdev, mesg)); ret = pci_set_power_state(pdev, pci_choose_state(pdev, mesg));
if (ret) { if (ret) {
pr_err("error:%d occurred in pci_set_power_state\n", ret); pr_err("error:%d occurred in pci_set_power_state\n", ret);
@ -1053,14 +1052,14 @@ static int lynxfb_pci_probe(struct pci_dev *pdev,
int err; int err;
/* enable device */ /* enable device */
err = pci_enable_device(pdev); err = pcim_enable_device(pdev);
if (err) if (err)
return err; return err;
err = -ENOMEM; err = -ENOMEM;
sm750_dev = devm_kzalloc(&pdev->dev, sizeof(*sm750_dev), GFP_KERNEL); sm750_dev = devm_kzalloc(&pdev->dev, sizeof(*sm750_dev), GFP_KERNEL);
if (!sm750_dev) if (!sm750_dev)
goto disable_pci; return err;
sm750_dev->fbinfo[0] = sm750_dev->fbinfo[1] = NULL; sm750_dev->fbinfo[0] = sm750_dev->fbinfo[1] = NULL;
sm750_dev->devid = pdev->device; sm750_dev->devid = pdev->device;
@ -1115,8 +1114,6 @@ static int lynxfb_pci_probe(struct pci_dev *pdev,
release_fb: release_fb:
sm750fb_frambuffer_release(sm750_dev); sm750fb_frambuffer_release(sm750_dev);
disable_pci:
pci_disable_device(pdev);
return err; return err;
} }