Commit d01dcc6e authored by Alex Chiang's avatar Alex Chiang Committed by james toy

No need to export those device attributes.

In fact, without this patch, we can trip over a build error if hpsa
is a built-in and another driver also declares and exports attributes
with the same name.

You'll see errors like:

	drivers/scsi/built-in.o: multiple definition of `dev_attr_lunid'
	drivers/block/built-in.o: first defined here
Signed-off-by: default avatarAlex Chiang <achiang@hp.com>
Cc: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Cc: Mike Miller <mikem@beardog.cce.hp.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 9197fe19
...@@ -151,10 +151,10 @@ static int check_for_unit_attention(struct ctlr_info *h, ...@@ -151,10 +151,10 @@ static int check_for_unit_attention(struct ctlr_info *h,
static void check_ioctl_unit_attention(struct ctlr_info *h, static void check_ioctl_unit_attention(struct ctlr_info *h,
struct CommandList *c); struct CommandList *c);
DEVICE_ATTR(raid_level, S_IRUGO, raid_level_show, NULL); static DEVICE_ATTR(raid_level, S_IRUGO, raid_level_show, NULL);
DEVICE_ATTR(lunid, S_IRUGO, lunid_show, NULL); static DEVICE_ATTR(lunid, S_IRUGO, lunid_show, NULL);
DEVICE_ATTR(unique_id, S_IRUGO, unique_id_show, NULL); static DEVICE_ATTR(unique_id, S_IRUGO, unique_id_show, NULL);
DEVICE_ATTR(rescan, S_IWUSR, NULL, host_store_rescan); static DEVICE_ATTR(rescan, S_IWUSR, NULL, host_store_rescan);
static struct device_attribute *hpsa_sdev_attrs[] = { static struct device_attribute *hpsa_sdev_attrs[] = {
&dev_attr_raid_level, &dev_attr_raid_level,
......
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