fixup users of device_remove_file to pass a struct device_attribute, instead of a...

diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 611890d49dcc56e902987e823e0fae3ced363cef..f9a64f29aec1818ed416d0606539da9bc891a23a 100644 (file)
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1556,8 +1556,8 @@ static void sg_detach(Scsi_Device * scsidp)
             }
            SCSI_LOG_TIMEOUT(3, printk("sg_detach: dev=%d, dirty\n", k));
            devfs_unregister (sdp->de);
-           device_remove_file(&sdp->sg_driverfs_dev,sg_device_type_file.name);
-           device_remove_file(&sdp->sg_driverfs_dev,sg_device_kdev_file.name);
+           device_remove_file(&sdp->sg_driverfs_dev,&sg_device_type_file);
+           device_remove_file(&sdp->sg_driverfs_dev,&sg_device_kdev_file);
            put_device(&sdp->sg_driverfs_dev);
            sdp->de = NULL;
            if (NULL == sdp->headfp) {

diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index e2bee21a714a7f21bace3654369d74ad1739044e..1618e58d2c616cb7d69a1047df070dde854b17f2 100644 (file)
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -3785,9 +3785,9 @@ static void st_detach(Scsi_Device * SDp)
                                devfs_unregister (tpnt->de_r[mode]);
                                tpnt->de_r[mode] = NULL;
                                device_remove_file(&tpnt->driverfs_dev_r[mode],
-                                                  st_device_type_file.name);
+                                                  &st_device_type_file);
                                device_remove_file(&tpnt->driverfs_dev_r[mode],
-                                                  st_device_kdev_file.name);
+                                                  &st_device_kdev_file);
                                put_device(&tpnt->driverfs_dev_r[mode]);
                                devfs_unregister (tpnt->de_n[mode]);
                                tpnt->de_n[mode] = NULL;

diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index c2f29b7128564535f5afd6b5dd1ab9658b7228c0..fe75423215ccce5e92935e02d4ee7e0a25462f9c 100644 (file)
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -317,17 +317,17 @@ void driverfs_remove_partitions(struct gendisk *hd, int minor)
                if ((p[part].nr_sects >= 1)) {
                        current_driverfs_dev = &p[part].hd_driverfs_dev;
                        device_remove_file(current_driverfs_dev,
-                                       partition_device_type_file.name);
+                                       &partition_device_type_file);
                        device_remove_file(current_driverfs_dev,
-                                       partition_device_kdev_file.name);
+                                       &partition_device_kdev_file);
                        put_device(current_driverfs_dev);       
                }
        }
        current_driverfs_dev = &p->hd_driverfs_dev;
        device_remove_file(current_driverfs_dev, 
-                               partition_device_type_file.name);
+                          &partition_device_type_file);
        device_remove_file(current_driverfs_dev, 
-                               partition_device_kdev_file.name);
+                          &partition_device_kdev_file);
        put_device(current_driverfs_dev);       
        return;
 }