Commit 01f9a347 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Revert "scsi: aic94xx: fix module loading"

This reverts commit d2635859 which is
commit 42caa0ed upstream.

It's not needed in the 4.9.y tree, my fault for backporting it that far.
Reported-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 162a93c2
...@@ -281,7 +281,7 @@ static ssize_t asd_show_dev_rev(struct device *dev, ...@@ -281,7 +281,7 @@ static ssize_t asd_show_dev_rev(struct device *dev,
return snprintf(buf, PAGE_SIZE, "%s\n", return snprintf(buf, PAGE_SIZE, "%s\n",
asd_dev_rev[asd_ha->revision_id]); asd_dev_rev[asd_ha->revision_id]);
} }
static DEVICE_ATTR(aic_revision, S_IRUGO, asd_show_dev_rev, NULL); static DEVICE_ATTR(revision, S_IRUGO, asd_show_dev_rev, NULL);
static ssize_t asd_show_dev_bios_build(struct device *dev, static ssize_t asd_show_dev_bios_build(struct device *dev,
struct device_attribute *attr,char *buf) struct device_attribute *attr,char *buf)
...@@ -478,7 +478,7 @@ static int asd_create_dev_attrs(struct asd_ha_struct *asd_ha) ...@@ -478,7 +478,7 @@ static int asd_create_dev_attrs(struct asd_ha_struct *asd_ha)
{ {
int err; int err;
err = device_create_file(&asd_ha->pcidev->dev, &dev_attr_aic_revision); err = device_create_file(&asd_ha->pcidev->dev, &dev_attr_revision);
if (err) if (err)
return err; return err;
...@@ -500,13 +500,13 @@ static int asd_create_dev_attrs(struct asd_ha_struct *asd_ha) ...@@ -500,13 +500,13 @@ static int asd_create_dev_attrs(struct asd_ha_struct *asd_ha)
err_biosb: err_biosb:
device_remove_file(&asd_ha->pcidev->dev, &dev_attr_bios_build); device_remove_file(&asd_ha->pcidev->dev, &dev_attr_bios_build);
err_rev: err_rev:
device_remove_file(&asd_ha->pcidev->dev, &dev_attr_aic_revision); device_remove_file(&asd_ha->pcidev->dev, &dev_attr_revision);
return err; return err;
} }
static void asd_remove_dev_attrs(struct asd_ha_struct *asd_ha) static void asd_remove_dev_attrs(struct asd_ha_struct *asd_ha)
{ {
device_remove_file(&asd_ha->pcidev->dev, &dev_attr_aic_revision); device_remove_file(&asd_ha->pcidev->dev, &dev_attr_revision);
device_remove_file(&asd_ha->pcidev->dev, &dev_attr_bios_build); device_remove_file(&asd_ha->pcidev->dev, &dev_attr_bios_build);
device_remove_file(&asd_ha->pcidev->dev, &dev_attr_pcba_sn); device_remove_file(&asd_ha->pcidev->dev, &dev_attr_pcba_sn);
device_remove_file(&asd_ha->pcidev->dev, &dev_attr_update_bios); device_remove_file(&asd_ha->pcidev->dev, &dev_attr_update_bios);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment