diff options
Diffstat (limited to 'drivers/scsi/sg.c')
| -rw-r--r-- | drivers/scsi/sg.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index fd56b7ec88b6..861e51375d70 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c | |||
| @@ -104,8 +104,8 @@ static int sg_allow_dio = SG_ALLOW_DIO_DEF; | |||
| 104 | 104 | ||
| 105 | #define SG_DEV_ARR_LUMP 32 /* amount to over allocate sg_dev_arr by */ | 105 | #define SG_DEV_ARR_LUMP 32 /* amount to over allocate sg_dev_arr by */ |
| 106 | 106 | ||
| 107 | static int sg_add(struct class_device *); | 107 | static int sg_add(struct class_device *, struct class_interface *); |
| 108 | static void sg_remove(struct class_device *); | 108 | static void sg_remove(struct class_device *, struct class_interface *); |
| 109 | 109 | ||
| 110 | static Scsi_Request *dummy_cmdp; /* only used for sizeof */ | 110 | static Scsi_Request *dummy_cmdp; /* only used for sizeof */ |
| 111 | 111 | ||
| @@ -1506,7 +1506,7 @@ static int sg_alloc(struct gendisk *disk, struct scsi_device *scsidp) | |||
| 1506 | } | 1506 | } |
| 1507 | 1507 | ||
| 1508 | static int | 1508 | static int |
| 1509 | sg_add(struct class_device *cl_dev) | 1509 | sg_add(struct class_device *cl_dev, struct class_interface *cl_intf) |
| 1510 | { | 1510 | { |
| 1511 | struct scsi_device *scsidp = to_scsi_device(cl_dev->dev); | 1511 | struct scsi_device *scsidp = to_scsi_device(cl_dev->dev); |
| 1512 | struct gendisk *disk; | 1512 | struct gendisk *disk; |
| @@ -1550,7 +1550,7 @@ sg_add(struct class_device *cl_dev) | |||
| 1550 | if (sg_sysfs_valid) { | 1550 | if (sg_sysfs_valid) { |
| 1551 | struct class_device * sg_class_member; | 1551 | struct class_device * sg_class_member; |
| 1552 | 1552 | ||
| 1553 | sg_class_member = class_device_create(sg_sysfs_class, | 1553 | sg_class_member = class_device_create(sg_sysfs_class, NULL, |
| 1554 | MKDEV(SCSI_GENERIC_MAJOR, k), | 1554 | MKDEV(SCSI_GENERIC_MAJOR, k), |
| 1555 | cl_dev->dev, "%s", | 1555 | cl_dev->dev, "%s", |
| 1556 | disk->disk_name); | 1556 | disk->disk_name); |
| @@ -1582,7 +1582,7 @@ out: | |||
| 1582 | } | 1582 | } |
| 1583 | 1583 | ||
| 1584 | static void | 1584 | static void |
| 1585 | sg_remove(struct class_device *cl_dev) | 1585 | sg_remove(struct class_device *cl_dev, struct class_interface *cl_intf) |
| 1586 | { | 1586 | { |
| 1587 | struct scsi_device *scsidp = to_scsi_device(cl_dev->dev); | 1587 | struct scsi_device *scsidp = to_scsi_device(cl_dev->dev); |
| 1588 | Sg_device *sdp = NULL; | 1588 | Sg_device *sdp = NULL; |
