From 3df7e8a77e8cac1daea3ad0842ed3fd2105f98f0 Mon Sep 17 00:00:00 2001 From: Jeremy Sowden Date: Tue, 21 May 2019 11:35:24 +0100 Subject: [PATCH] staging: kpc2000: removed superfluous NULL checks from device attribute call-backs. All the attribute show call-backs check whether pcard is NULL. However, pci_set_drvdata(pdev, pcard) is called before the sysfs files are created during probe, and pci_set_drvdata(pdev, NULL) is not called until after they are destroyed during remove; therefore, pcard will not be NULL, and we can drop the checks. Signed-off-by: Jeremy Sowden Signed-off-by: Greg Kroah-Hartman --- drivers/staging/kpc2000/kpc2000/core.c | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/drivers/staging/kpc2000/kpc2000/core.c b/drivers/staging/kpc2000/kpc2000/core.c index 2af4170a0d68..4110032d0cbb 100644 --- a/drivers/staging/kpc2000/kpc2000/core.c +++ b/drivers/staging/kpc2000/kpc2000/core.c @@ -37,9 +37,6 @@ static ssize_t ssid_show(struct device *dev, struct device_attribute *attr, { struct kp2000_device *pcard = dev_get_drvdata(dev); - if (!pcard) - return -ENXIO; - return sprintf(buf, "%016llx\n", pcard->ssid); } static DEVICE_ATTR_RO(ssid); @@ -49,9 +46,6 @@ static ssize_t ddna_show(struct device *dev, struct device_attribute *attr, { struct kp2000_device *pcard = dev_get_drvdata(dev); - if (!pcard) - return -ENXIO; - return sprintf(buf, "%016llx\n", pcard->ddna); } static DEVICE_ATTR_RO(ddna); @@ -61,9 +55,6 @@ static ssize_t card_id_show(struct device *dev, struct device_attribute *attr, { struct kp2000_device *pcard = dev_get_drvdata(dev); - if (!pcard) - return -ENXIO; - return sprintf(buf, "%08x\n", pcard->card_id); } static DEVICE_ATTR_RO(card_id); @@ -73,9 +64,6 @@ static ssize_t hw_rev_show(struct device *dev, struct device_attribute *attr, { struct kp2000_device *pcard = dev_get_drvdata(dev); - if (!pcard) - return -ENXIO; - return sprintf(buf, "%08x\n", pcard->hardware_revision); } static DEVICE_ATTR_RO(hw_rev); @@ -85,9 +73,6 @@ static ssize_t build_show(struct device *dev, struct device_attribute *attr, { struct kp2000_device *pcard = dev_get_drvdata(dev); - if (!pcard) - return -ENXIO; - return sprintf(buf, "%08x\n", pcard->build_version); } static DEVICE_ATTR_RO(build); @@ -97,9 +82,6 @@ static ssize_t build_date_show(struct device *dev, { struct kp2000_device *pcard = dev_get_drvdata(dev); - if (!pcard) - return -ENXIO; - return sprintf(buf, "%08x\n", pcard->build_datestamp); } static DEVICE_ATTR_RO(build_date); @@ -109,9 +91,6 @@ static ssize_t build_time_show(struct device *dev, { struct kp2000_device *pcard = dev_get_drvdata(dev); - if (!pcard) - return -ENXIO; - return sprintf(buf, "%08x\n", pcard->build_timestamp); } static DEVICE_ATTR_RO(build_time); @@ -122,9 +101,6 @@ static ssize_t cpld_reg_show(struct device *dev, struct device_attribute *attr, struct kp2000_device *pcard = dev_get_drvdata(dev); u64 val; - if (!pcard) - return -ENXIO; - val = readq(pcard->sysinfo_regs_base + REG_CPLD_CONFIG); return sprintf(buf, "%016llx\n", val); } @@ -138,9 +114,6 @@ static ssize_t cpld_reconfigure(struct device *dev, long wr_val; int rv; - if (!pcard) - return -ENXIO; - rv = kstrtol(buf, 0, &wr_val); if (rv < 0) return rv; -- 2.11.0