Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d97b321425e237e3e6c6bbe2c40dc0e09d0e3264

Authored by Amos Waterland
Committed by Linus Torvalds
1 parent 42e50a5a69
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] protect ide_cdrom_capacity by ifdef 

The only call to ide_cdrom_capacity is in code protected by
CONFIG_PROC_FS, so when that is not enabled, the compiler complains:

 drivers/ide/ide-cd.c:3259: warning: `ide_cdrom_capacity' defined but not used

Here is a patch that fixes that.  It provides some space savings for
embedded systems that are not using procfs, as well:

     text    data     bss     dec     hex filename
 -  33540    6504    1032   41076    a074 drivers/ide/ide-cd.o
 +  33468    6480    1032   40980    a014 drivers/ide/ide-cd.o

Signed-off-by: Amos Waterland <apw@us.ibm.com>
Cc: Jens Axboe <axboe@suse.de>
Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 2 additions and 0 deletions Side-by-side Diff

drivers/ide/ide-cd.c
Diff comments   View file @ d97b321
... ... @@ -3254,6 +3254,7 @@
3254 3254 return 0;
3255 3255 }
3256 3256  
  3257 +#ifdef CONFIG_PROC_FS
3257 3258 static
3258 3259 sector_t ide_cdrom_capacity (ide_drive_t *drive)
3259 3260 {
... ... @@ -3264,6 +3265,7 @@
3264 3265  
3265 3266 return capacity * sectors_per_frame;
3266 3267 }
  3268 +#endif
3267 3269  
3268 3270 static int ide_cd_remove(struct device *dev)
3269 3271 {