Skip to content

Commit

Permalink
staging: kpc2000: added a helper to get struct kp2000_device from str…
Browse files Browse the repository at this point in the history
…uct device.

The attribute call-backs all use the same formula to get the pcard from
dev:

  struct pci_dev *pdev = to_pci_dev(dev);
  struct kp2000_device *pcard;

  if (!pdev)
    return -ENXIO;
  pcard = pci_get_drvdata(pdev);
  if (!pcard)
    return -ENXIO;

Added a function to reduce the duplicated code.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
a3a3el authored and gregkh committed May 22, 2019
1 parent d8ac359 commit a986d79
Showing 1 changed file with 13 additions and 16 deletions.
29 changes: 13 additions & 16 deletions drivers/staging/kpc2000/kpc2000/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,21 @@
* SysFS Attributes
******************************************************/

static ssize_t show_attr(struct device *dev, struct device_attribute *attr,
char *buf)
static struct kp2000_device *get_pcard(struct device *dev)
{
struct pci_dev *pdev = to_pci_dev(dev);
struct kp2000_device *pcard;

if (!pdev)
return -ENXIO;
pcard = pci_get_drvdata(pdev);
return NULL;

return pci_get_drvdata(pdev);
}

static ssize_t show_attr(struct device *dev, struct device_attribute *attr,
char *buf)
{
struct kp2000_device *pcard = get_pcard(dev);

if (!pcard)
return -ENXIO;

Expand Down Expand Up @@ -72,14 +78,9 @@ static ssize_t show_attr(struct device *dev, struct device_attribute *attr,
static ssize_t show_cpld_config_reg(struct device *dev,
struct device_attribute *attr, char *buf)
{
struct pci_dev *pdev = to_pci_dev(dev);
struct kp2000_device *pcard;
struct kp2000_device *pcard = get_pcard(dev);
u64 val;

if (!pdev)
return -ENXIO;

pcard = pci_get_drvdata(pdev);
if (!pcard)
return -ENXIO;

Expand All @@ -91,14 +92,10 @@ static ssize_t cpld_reconfigure(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t count)
{
struct pci_dev *pdev = to_pci_dev(dev);
struct kp2000_device *pcard = get_pcard(dev);
long wr_val;
struct kp2000_device *pcard;
int rv;

if (!pdev)
return -ENXIO;
pcard = pci_get_drvdata(pdev);
if (!pcard)
return -ENXIO;

Expand Down

0 comments on commit a986d79

Please sign in to comment.