[PATCH] ide: remove ide_driver_t.owner field
The structure ide_driver_t have a .owner field which is a duplicate of .gendriver.owner field (.gen_driver is a struct device_driver). This patch removes ide_driver_t's owner field. Signed-off-by: Laurent Riffard <laurent.riffard@free.fr> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
committed by
Bartlomiej Zolnierkiewicz
parent
7462cbff7d
commit
4ef3b8f4a5
@@ -3328,8 +3328,8 @@ static ide_proc_entry_t idecd_proc[] = {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
static ide_driver_t ide_cdrom_driver = {
|
static ide_driver_t ide_cdrom_driver = {
|
||||||
.owner = THIS_MODULE,
|
|
||||||
.gen_driver = {
|
.gen_driver = {
|
||||||
|
.owner = THIS_MODULE,
|
||||||
.name = "ide-cdrom",
|
.name = "ide-cdrom",
|
||||||
.bus = &ide_bus_type,
|
.bus = &ide_bus_type,
|
||||||
.probe = ide_cd_probe,
|
.probe = ide_cd_probe,
|
||||||
|
@@ -1089,8 +1089,8 @@ static void ide_device_shutdown(struct device *dev)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static ide_driver_t idedisk_driver = {
|
static ide_driver_t idedisk_driver = {
|
||||||
.owner = THIS_MODULE,
|
|
||||||
.gen_driver = {
|
.gen_driver = {
|
||||||
|
.owner = THIS_MODULE,
|
||||||
.name = "ide-disk",
|
.name = "ide-disk",
|
||||||
.bus = &ide_bus_type,
|
.bus = &ide_bus_type,
|
||||||
.probe = ide_disk_probe,
|
.probe = ide_disk_probe,
|
||||||
|
@@ -1925,8 +1925,8 @@ static ide_proc_entry_t idefloppy_proc[] = {
|
|||||||
static int ide_floppy_probe(struct device *);
|
static int ide_floppy_probe(struct device *);
|
||||||
|
|
||||||
static ide_driver_t idefloppy_driver = {
|
static ide_driver_t idefloppy_driver = {
|
||||||
.owner = THIS_MODULE,
|
|
||||||
.gen_driver = {
|
.gen_driver = {
|
||||||
|
.owner = THIS_MODULE,
|
||||||
.name = "ide-floppy",
|
.name = "ide-floppy",
|
||||||
.bus = &ide_bus_type,
|
.bus = &ide_bus_type,
|
||||||
.probe = ide_floppy_probe,
|
.probe = ide_floppy_probe,
|
||||||
|
@@ -4748,8 +4748,8 @@ static ide_proc_entry_t idetape_proc[] = {
|
|||||||
static int ide_tape_probe(struct device *);
|
static int ide_tape_probe(struct device *);
|
||||||
|
|
||||||
static ide_driver_t idetape_driver = {
|
static ide_driver_t idetape_driver = {
|
||||||
.owner = THIS_MODULE,
|
|
||||||
.gen_driver = {
|
.gen_driver = {
|
||||||
|
.owner = THIS_MODULE,
|
||||||
.name = "ide-tape",
|
.name = "ide-tape",
|
||||||
.bus = &ide_bus_type,
|
.bus = &ide_bus_type,
|
||||||
.probe = ide_tape_probe,
|
.probe = ide_tape_probe,
|
||||||
|
@@ -784,8 +784,8 @@ static ide_proc_entry_t idescsi_proc[] = {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
static ide_driver_t idescsi_driver = {
|
static ide_driver_t idescsi_driver = {
|
||||||
.owner = THIS_MODULE,
|
|
||||||
.gen_driver = {
|
.gen_driver = {
|
||||||
|
.owner = THIS_MODULE,
|
||||||
.name = "ide-scsi",
|
.name = "ide-scsi",
|
||||||
.bus = &ide_bus_type,
|
.bus = &ide_bus_type,
|
||||||
.probe = ide_scsi_probe,
|
.probe = ide_scsi_probe,
|
||||||
|
@@ -1089,9 +1089,11 @@ enum {
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* Subdrivers support.
|
* Subdrivers support.
|
||||||
|
*
|
||||||
|
* The gendriver.owner field should be set to the module owner of this driver.
|
||||||
|
* The gendriver.name field should be set to the name of this driver
|
||||||
*/
|
*/
|
||||||
typedef struct ide_driver_s {
|
typedef struct ide_driver_s {
|
||||||
struct module *owner;
|
|
||||||
const char *version;
|
const char *version;
|
||||||
u8 media;
|
u8 media;
|
||||||
unsigned supports_dsc_overlap : 1;
|
unsigned supports_dsc_overlap : 1;
|
||||||
|
Reference in New Issue
Block a user