Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Revert "scsi: aic94xx: fix module loading" 



This reverts commit d2635859 which is
commit 42caa0edabd6a0a392ec36a5f0943924e4954311 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

drivers/scsi/aic94xx/aic94xx_init.c

+4 −4
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ static ssize_t asd_show_dev_rev(struct device *dev, 
	return snprintf(buf, PAGE_SIZE, "%s\n",

			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,

				       struct device_attribute *attr,char *buf)
@@ -478,7 +478,7 @@ static int asd_create_dev_attrs(struct asd_ha_struct *asd_ha) 
{

	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)

		return err;
@@ -500,13 +500,13 @@ static int asd_create_dev_attrs(struct asd_ha_struct *asd_ha) 
err_biosb:

	device_remove_file(&asd_ha->pcidev->dev, &dev_attr_bios_build);

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;

}



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_pcba_sn);

	device_remove_file(&asd_ha->pcidev->dev, &dev_attr_update_bios);