Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

scsi: gdth: remove dead code under #ifdef GDTH_IOCTL_PROC

This can't ever be compiled into the kernel, so remove it.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Christoph Hellwig and committed by
Martin K. Petersen
9affa597 1d978c33

-107
-89
drivers/scsi/gdth_ioctl.h
··· 27 27 #define GDTH_MAXSG 32 /* max. s/g elements */ 28 28 29 29 #define MAX_LDRIVES 255 /* max. log. drive count */ 30 - #ifdef GDTH_IOCTL_PROC 31 - #define MAX_HDRIVES 100 /* max. host drive count */ 32 - #else 33 30 #define MAX_HDRIVES MAX_LDRIVES /* max. host drive count */ 34 - #endif 35 31 36 32 /* scatter/gather element */ 37 33 typedef struct { ··· 173 177 u8 reserved; 174 178 gdth_evt_data event_data; 175 179 } __attribute__((packed)) gdth_evt_str; 176 - 177 - 178 - #ifdef GDTH_IOCTL_PROC 179 - /* IOCTL structure (write) */ 180 - typedef struct { 181 - u32 magic; /* IOCTL magic */ 182 - u16 ioctl; /* IOCTL */ 183 - u16 ionode; /* controller number */ 184 - u16 service; /* controller service */ 185 - u16 timeout; /* timeout */ 186 - union { 187 - struct { 188 - u8 command[512]; /* controller command */ 189 - u8 data[1]; /* add. data */ 190 - } general; 191 - struct { 192 - u8 lock; /* lock/unlock */ 193 - u8 drive_cnt; /* drive count */ 194 - u16 drives[MAX_HDRIVES];/* drives */ 195 - } lockdrv; 196 - struct { 197 - u8 lock; /* lock/unlock */ 198 - u8 channel; /* channel */ 199 - } lockchn; 200 - struct { 201 - int erase; /* erase event ? */ 202 - int handle; 203 - u8 evt[EVENT_SIZE]; /* event structure */ 204 - } event; 205 - struct { 206 - u8 bus; /* SCSI bus */ 207 - u8 target; /* target ID */ 208 - u8 lun; /* LUN */ 209 - u8 cmd_len; /* command length */ 210 - u8 cmd[12]; /* SCSI command */ 211 - } scsi; 212 - struct { 213 - u16 hdr_no; /* host drive number */ 214 - u8 flag; /* old meth./add/remove */ 215 - } rescan; 216 - } iu; 217 - } gdth_iowr_str; 218 - 219 - /* IOCTL structure (read) */ 220 - typedef struct { 221 - u32 size; /* buffer size */ 222 - u32 status; /* IOCTL error code */ 223 - union { 224 - struct { 225 - u8 data[1]; /* data */ 226 - } general; 227 - struct { 228 - u16 version; /* driver version */ 229 - } drvers; 230 - struct { 231 - u8 type; /* controller type */ 232 - u16 info; /* slot etc. */ 233 - u16 oem_id; /* OEM ID */ 234 - u16 bios_ver; /* not used */ 235 - u16 access; /* not used */ 236 - u16 ext_type; /* extended type */ 237 - u16 device_id; /* device ID */ 238 - u16 sub_device_id; /* sub device ID */ 239 - } ctrtype; 240 - struct { 241 - u8 version; /* OS version */ 242 - u8 subversion; /* OS subversion */ 243 - u16 revision; /* revision */ 244 - } osvers; 245 - struct { 246 - u16 count; /* controller count */ 247 - } ctrcnt; 248 - struct { 249 - int handle; 250 - u8 evt[EVENT_SIZE]; /* event structure */ 251 - } event; 252 - struct { 253 - u8 bus; /* SCSI bus, 0xff: invalid */ 254 - u8 target; /* target ID */ 255 - u8 lun; /* LUN */ 256 - u8 cluster_type; /* cluster properties */ 257 - } hdr_list[MAX_HDRIVES]; /* index is host drive number */ 258 - } iu; 259 - } gdth_iord_str; 260 - #endif 261 180 262 181 /* GDTIOCTL_GENERAL */ 263 182 typedef struct {
-18
drivers/scsi/gdth_proc.c
··· 557 557 return rc; 558 558 } 559 559 560 - #ifdef GDTH_IOCTL_PROC 561 - static int gdth_ioctl_check_bin(gdth_ha_str *ha, u16 size) 562 - { 563 - unsigned long flags; 564 - int ret_val; 565 - 566 - spin_lock_irqsave(&ha->smp_lock, flags); 567 - 568 - ret_val = FALSE; 569 - if (ha->scratch_busy) { 570 - if (((gdth_iord_str *)ha->pscratch)->size == (u32)size) 571 - ret_val = TRUE; 572 - } 573 - spin_unlock_irqrestore(&ha->smp_lock, flags); 574 - return ret_val; 575 - } 576 - #endif 577 - 578 560 static void gdth_wait_completion(gdth_ha_str *ha, int busnum, int id) 579 561 { 580 562 unsigned long flags;