Commit 90092a57 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by James Bottomley

[PATCH] misc cleanups for sr

bring it back in line with sd:
* get rid of typedefs where possible
* tab-align all credits entries
* line-wrap after 80 characters
* use C99-initializers
parent 018bcdc5
This diff is collapsed.
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
/* In fact, it is very slow if it has to spin up first */ /* In fact, it is very slow if it has to spin up first */
#define IOCTL_TIMEOUT 30*HZ #define IOCTL_TIMEOUT 30*HZ
typedef struct { typedef struct scsi_cd {
unsigned capacity; /* size in blocks */ unsigned capacity; /* size in blocks */
Scsi_Device *device; Scsi_Device *device;
unsigned int vendor; /* vendor code, see sr_vendor.c */ unsigned int vendor; /* vendor code, see sr_vendor.c */
......
...@@ -5,15 +5,14 @@ ...@@ -5,15 +5,14 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/buffer_head.h> /* for invalidate_buffers() */
#include <linux/blk.h> #include <linux/blk.h>
#include <linux/blkpg.h> #include <linux/blkpg.h>
#include <linux/cdrom.h>
#include "scsi.h" #include "scsi.h"
#include "hosts.h" #include "hosts.h"
#include <scsi/scsi_ioctl.h> #include <scsi/scsi_ioctl.h>
#include <linux/cdrom.h>
#include "sr.h" #include "sr.h"
#if 0 #if 0
...@@ -76,8 +75,8 @@ static int sr_fake_playtrkind(struct cdrom_device_info *cdi, struct cdrom_ti *ti ...@@ -76,8 +75,8 @@ static int sr_fake_playtrkind(struct cdrom_device_info *cdi, struct cdrom_ti *ti
int sr_do_ioctl(Scsi_CD *cd, struct cdrom_generic_command *cgc) int sr_do_ioctl(Scsi_CD *cd, struct cdrom_generic_command *cgc)
{ {
Scsi_Request *SRpnt; struct scsi_request *SRpnt;
Scsi_Device *SDev; struct scsi_device *SDev;
struct request *req; struct request *req;
int result, err = 0, retries = 0; int result, err = 0, retries = 0;
char *bounce_buffer; char *bounce_buffer;
...@@ -555,21 +554,3 @@ int sr_dev_ioctl(struct cdrom_device_info *cdi, ...@@ -555,21 +554,3 @@ int sr_dev_ioctl(struct cdrom_device_info *cdi,
Scsi_CD *cd = cdi->handle; Scsi_CD *cd = cdi->handle;
return scsi_ioctl(cd->device, cmd, (void *)arg); return scsi_ioctl(cd->device, cmd, (void *)arg);
} }
/*
* Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically
* adjust the settings for this buffer only. This must remain at the end
* of the file.
* ---------------------------------------------------------------------------
* Local variables:
* c-indent-level: 4
* c-brace-imaginary-offset: 0
* c-brace-offset: -4
* c-argdecl-indent: 4
* c-label-offset: -4
* c-continued-statement-offset: 4
* c-continued-brace-offset: 0
* tab-width: 8
* End:
*/
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