Fixup users of driverfs:

do a s/driver_file_entry/device_attribute/g on all of them.

drivers/pci/proc.c

@@ -378,7 +378,7 @@ static ssize_t pci_show_irq(struct device * dev, char * buf, size_t count, loff_
 	return off ? 0 : sprintf(buf,"%u\n",pci_dev->irq);
 }
 
-static struct driver_file_entry pci_irq_entry = {
+static struct device_attribute pci_irq_entry = {
 	name:	"irq",
 	mode:	S_IRUGO,
 	show:	pci_show_irq,
@@ -406,7 +406,7 @@ static ssize_t pci_show_resources(struct device * dev, char * buf, size_t count,
 	return (str - buf);
 }
 
-static struct driver_file_entry pci_resource_entry = {
+static struct device_attribute pci_resource_entry = {
 	name:	"resources",
 	mode:	S_IRUGO,
 	show:	pci_show_resources,

drivers/scsi/scsi_scan.c

@@ -306,7 +306,7 @@ static ssize_t scsi_device_type_read(struct device *driverfs_dev, char *page,
 	return 0;
 }
 
-static struct driver_file_entry scsi_device_type_file = {
+static struct device_attribute scsi_device_type_file = {
 	name: "type",
 	mode: S_IRUGO,
 	show: scsi_device_type_read,

drivers/scsi/sg.c

@@ -1402,7 +1402,7 @@ static ssize_t sg_device_kdev_read(struct device *driverfs_dev, char *page,
 	Sg_device * sdp=list_entry(driverfs_dev, Sg_device, sg_driverfs_dev);
 	return off ? 0 : sprintf(page, "%x\n",sdp->i_rdev.value);
 }
-static struct driver_file_entry sg_device_kdev_file = {
+static struct device_attribute sg_device_kdev_file = {
 	name: "kdev",
 	mode: S_IRUGO,
 	show: sg_device_kdev_read,
@@ -1413,7 +1413,7 @@ static ssize_t sg_device_type_read(struct device *driverfs_dev, char *page,
 {
 	return off ? 0 : sprintf (page, "CHR\n");
 }
-static struct driver_file_entry sg_device_type_file = {
+static struct device_attribute sg_device_type_file = {
 	name: "type",
 	mode: S_IRUGO,
 	show: sg_device_type_read,

drivers/scsi/sr.c

@@ -739,7 +739,7 @@ static ssize_t sr_device_kdev_read(struct device *driverfs_dev,
 	kdev.value=(int)driverfs_dev->driver_data;
 	return off ? 0 : sprintf(page, "%x\n",kdev.value);
 }
-static struct driver_file_entry sr_device_kdev_file = {
+static struct device_attribute sr_device_kdev_file = {
 	name: "kdev",
 	mode: S_IRUGO,
 	show: sr_device_kdev_read,
@@ -750,7 +750,7 @@ static ssize_t sr_device_type_read(struct device *driverfs_dev,
 {
 	return off ? 0 : sprintf (page, "CHR\n");
 }
-static struct driver_file_entry sr_device_type_file = {
+static struct device_attribute sr_device_type_file = {
 	name: "type",
 	mode: S_IRUGO,
 	show: sr_device_type_read,

drivers/scsi/st.c

@@ -3533,7 +3533,7 @@ static ssize_t st_device_kdev_read(struct device *driverfs_dev,
 	kdev.value=(int)driverfs_dev->driver_data;
 	return off ? 0 : sprintf(page, "%x\n",kdev.value);
 }
-static struct driver_file_entry st_device_kdev_file = {
+static struct device_attribute st_device_kdev_file = {
 	name: "kdev",
 	mode: S_IRUGO,
 	show: st_device_kdev_read,
@@ -3544,7 +3544,7 @@ static ssize_t st_device_type_read(struct device *driverfs_dev,
 {
 	return off ? 0 : sprintf (page, "CHR\n");
 }
-static struct driver_file_entry st_device_type_file = {
+static struct device_attribute st_device_type_file = {
 	name: "type",
 	mode: S_IRUGO,
 	show: st_device_type_read,

drivers/usb/core/usb.c

@@ -835,7 +835,7 @@ show_config (struct device *dev, char *buf, size_t count, loff_t off)
 	udev = to_usb_device (dev);
 	return sprintf (buf, "%u\n", udev->actconfig->bConfigurationValue);
 }
-static struct driver_file_entry usb_config_entry = {
+static struct device_attribute usb_config_entry = {
 	.name =	"configuration",
 	.mode =	S_IRUGO,
 	.show =	show_config,
@@ -854,7 +854,7 @@ show_altsetting (struct device *dev, char *buf, size_t count, loff_t off)
 	interface = to_usb_interface (dev);
 	return sprintf (buf, "%u\n", interface->altsetting->bAlternateSetting);
 }
-static struct driver_file_entry usb_altsetting_entry = {
+static struct device_attribute usb_altsetting_entry = {
 	.name =	"altsetting",
 	.mode =	S_IRUGO,
 	.show =	show_altsetting,
@@ -875,7 +875,7 @@ static ssize_t show_product (struct device *dev, char *buf, size_t count, loff_t
 	buf[len+1] = 0x00;
 	return len+1;
 }
-static struct driver_file_entry usb_product_entry = {
+static struct device_attribute usb_product_entry = {
 	.name =	"product",
 	.mode =	S_IRUGO,
 	.show =	show_product,
@@ -897,7 +897,7 @@ show_manufacturer (struct device *dev, char *buf, size_t count, loff_t off)
 	buf[len+1] = 0x00;
 	return len+1;
 }
-static struct driver_file_entry usb_manufacturer_entry = {
+static struct device_attribute usb_manufacturer_entry = {
 	.name =	"manufacturer",
 	.mode =	S_IRUGO,
 	.show =	show_manufacturer,
@@ -919,7 +919,7 @@ show_serial (struct device *dev, char *buf, size_t count, loff_t off)
 	buf[len+1] = 0x00;
 	return len+1;
 }
-static struct driver_file_entry usb_serial_entry = {
+static struct device_attribute usb_serial_entry = {
 	.name =	"serial",
 	.mode =	S_IRUGO,
 	.show =	show_serial,

fs/partitions/check.c

@@ -210,7 +210,7 @@ static ssize_t partition_device_kdev_read(struct device *driverfs_dev,
 	kdev.value=(int)(long)driverfs_dev->driver_data;
 	return off ? 0 : sprintf (page, "%x\n",kdev.value);
 }
-static struct driver_file_entry partition_device_kdev_file = {
+static struct device_attribute partition_device_kdev_file = {
 	name: "kdev",
 	mode: S_IRUGO,
 	show: partition_device_kdev_read,
@@ -221,7 +221,7 @@ static ssize_t partition_device_type_read(struct device *driverfs_dev,
 {
 	return off ? 0 : sprintf (page, "BLK\n");
 }
-static struct driver_file_entry partition_device_type_file = {
+static struct device_attribute partition_device_type_file = {
 	name: "type",
 	mode: S_IRUGO,
 	show: partition_device_type_read,