Commit ac3b1b9b authored by Art Haas's avatar Art Haas Committed by David S. Miller

[PATCH] C99 initializers for drivers/cdrom

parent 0b68fae1
...@@ -322,13 +322,13 @@ static struct request_queue mcdx_queue; ...@@ -322,13 +322,13 @@ static struct request_queue mcdx_queue;
MODULE_PARM(mcdx, "1-4i"); MODULE_PARM(mcdx, "1-4i");
static struct cdrom_device_ops mcdx_dops = { static struct cdrom_device_ops mcdx_dops = {
open:mcdx_open, .open = mcdx_open,
release:mcdx_close, .release = mcdx_close,
media_changed:mcdx_media_changed, .media_changed = mcdx_media_changed,
tray_move:mcdx_tray_move, .tray_move = mcdx_tray_move,
lock_door:mcdx_lockdoor, .lock_door = mcdx_lockdoor,
audio_ioctl:mcdx_audio_ioctl, .audio_ioctl = mcdx_audio_ioctl,
capability:CDC_OPEN_TRAY | CDC_LOCK | CDC_MEDIA_CHANGED | .capability = CDC_OPEN_TRAY | CDC_LOCK | CDC_MEDIA_CHANGED |
CDC_PLAY_AUDIO | CDC_DRIVE_STATUS, CDC_PLAY_AUDIO | CDC_DRIVE_STATUS,
}; };
......
...@@ -1076,7 +1076,7 @@ static int tries; /* ibid?? */ ...@@ -1076,7 +1076,7 @@ static int tries; /* ibid?? */
static int timeout = 0; static int timeout = 0;
static void poll(unsigned long data); static void poll(unsigned long data);
static struct timer_list req_timer = {function: poll}; static struct timer_list req_timer = {.function = poll};
static void poll(unsigned long data) static void poll(unsigned long data)
......
...@@ -5469,22 +5469,22 @@ static void sbpcd_release(struct cdrom_device_info * cdi) ...@@ -5469,22 +5469,22 @@ static void sbpcd_release(struct cdrom_device_info * cdi)
*/ */
static int sbpcd_media_changed( struct cdrom_device_info *cdi, int disc_nr); static int sbpcd_media_changed( struct cdrom_device_info *cdi, int disc_nr);
static struct cdrom_device_ops sbpcd_dops = { static struct cdrom_device_ops sbpcd_dops = {
open: sbpcd_open, .open = sbpcd_open,
release: sbpcd_release, .release = sbpcd_release,
drive_status: sbpcd_drive_status, .drive_status = sbpcd_drive_status,
media_changed: sbpcd_media_changed, .media_changed = sbpcd_media_changed,
tray_move: sbpcd_tray_move, .tray_move = sbpcd_tray_move,
lock_door: sbpcd_lock_door, .lock_door = sbpcd_lock_door,
select_speed: sbpcd_select_speed, .select_speed = sbpcd_select_speed,
get_last_session: sbpcd_get_last_session, .get_last_session = sbpcd_get_last_session,
get_mcn: sbpcd_get_mcn, .get_mcn = sbpcd_get_mcn,
reset: sbpcd_reset, .reset = sbpcd_reset,
audio_ioctl: sbpcd_audio_ioctl, .audio_ioctl = sbpcd_audio_ioctl,
dev_ioctl: sbpcd_dev_ioctl, .dev_ioctl = sbpcd_dev_ioctl,
capability: CDC_CLOSE_TRAY | CDC_OPEN_TRAY | CDC_LOCK | .capability = CDC_CLOSE_TRAY | CDC_OPEN_TRAY | CDC_LOCK |
CDC_MULTI_SESSION | CDC_MEDIA_CHANGED | CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |
CDC_MCN | CDC_PLAY_AUDIO | CDC_IOCTLS, CDC_MCN | CDC_PLAY_AUDIO | CDC_IOCTLS,
n_minors: 1, .n_minors = 1,
}; };
/*==========================================================================*/ /*==========================================================================*/
......
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