提交 · 64814f2399e7dd1e6e53dd7d08a4ad54d02665d3 · openeuler / raspberrypi-kernel

02 2月, 2008 40 次提交

ide-cd: factor out transfer size checking from cdrom_read_intr() · 64814f23

由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008

This is a preparation for cdrom_read_intr() and cdrom_write_intr() merge.
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>

64814f23

ide-cd: add ide_cd_drain_data() helper · b4ab726c

由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008

Add ide_cd_drain_data() and use it in cdrom_{buffer_sectors,read_intr}()
(as a nice side-effect this cuts 0.5kB of code from ide-cd.o).

There should be no functionality changes caused by this patch.
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>

b4ab726c

ide-cd: merge cdrom_do_packet_command() and cdrom_do_block_pc() · c9f56a80

由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008

Add REQ_TYPE_{SENSE,ATA_PC} requests handling to cdrom_do_block_pc()
and remove cdrom_do_packet_command().

There should be no functionality changes caused by this patch.
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>

c9f56a80

ide-cd: remove cdrom_do_pc_continuation() · a7c7d163

由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008

cdrom_do_pc_continuation() is now identical to cdrom_do_newpc_cont()
so just always use the latter function.
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>

a7c7d163

ide-cd: merge cdrom_pc_intr() and cdrom_newpc_intr() · ff1bfbc1

由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008

Add handling of REQ_TYPE_{SENSE,ATA_PC} requests to cdrom_newpc_intr()
(please note that these requests never have 'bio' attached to them
and they never use DMA), then remove no longer needed cdrom_pc_intr().

There should be no functionality changes caused by this patch.
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>

ff1bfbc1

ide-cd: unify request end exit path in cdrom_pc_intr() · 8b67ebf6

由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008

This is a preparation for cdrom_pc_intr() and cdrom_newpc_intr() merge.
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>

8b67ebf6

ide-cd: factor out request sense fixup from cdrom_pc_intr() · 8ee69f5a

由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008

This is a preparation for cdrom_pc_intr() and cdrom_newpc_intr() merge.
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>

8ee69f5a

B
ide-cd: call blk_dump_rq_flags() on "missing data" in cdrom_newpc_intr() · 03f537d5
由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008
```
Acked-by: NSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
```
03f537d5

ide-cd: remove BUG_ON() from cdrom_newpc_intr() · 98add71e

由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008

There is no need for it anylonger and ide_set_handler() complains
if ->handler is not NULL anyway.
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>

98add71e

B
ide-cd: move code handling cdrom.c IOCTLs to ide-cd_ioctl.c · 17802998
由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008
```
There should be no functionality changes caused by this patch.
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
```
17802998

ide-cd: rename cdrom_* functions to ide_cd_* · 139c829d

由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008

* cdrom_prepare_request() -> ide_cd_init_rq()
* cdrom_queue_packet_command() -> ide_cd_queue_pc()
* cdrom_lockdoor() -> ide_cd_lockdoor()
* cdrom_read_toc() -> ide_cd_read_toc()
* cdrom_get_toc_entry() -> ide_cd_get_toc_entry()

This is a preparation to move code handling cdrom.c IOCTLs out of ide-cd.c.
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>

139c829d

ide-cd: coding style fixes for cdrom_get_toc_entry() · 5c937ae4

由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008

This is a preparation to move code handling cdrom.c IOCTLs out of ide-cd.c.
Acked-by: NSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>

5c937ae4

ide-cd: move lba_to_msf() and msf_to_lba() to <linux/cdrom.h> · a1bb9457

由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008

* Move lba_to_msf() and msf_to_lba() to <linux/cdrom.h>
  (use 'u8' type instead of 'byte' while at it).

* Remove msf_to_lba() copy from drivers/cdrom/cdrom.c.
Acked-by: NJens Axboe <jens.axboe@oracle.com>
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>

a1bb9457

B
ide-cd: merge cdrom_select_speed() into ide_cdrom_select_speed() · 5c68429d
由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008
```
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
```
5c68429d
B
ide-cd: merge cdrom_read_subchannel() into ide_cdrom_get_mcn() · 53126b91
由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008
```
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
```
53126b91
B
ide-cd: merge cdrom_play_audio() into ide_cd_fake_play_trkind() · a891b144
由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008
```
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
```
a891b144
B
ide-cd: factor out ioctl handlers from ide_cdrom_audio_ioctl() · ba3fab24
由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008
```
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
```
ba3fab24

ide-cd: move VERBOSE_IDE_CD_ERRORS code to ide-cd_verbose.c · 972560fb

由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008

* Rename ide-cd kernel module to ide-cd_mod in preparation to moving code out
  from ide-cd.[c,h].   Add MODULE_ALIAS("ide-cd") to preserve compatibility.

* Move VERBOSE_IDE_CD_ERRORS code from ide-cd.[c,h] to ide-cd_verbose.c.

  ide-cd_verbose.c is IDE subsystem independent and may be easily converted
  into generic library usable by other drivers (i.e. libata) if needed.

* Add CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS config option to drivers/ide/Kconfig
  replacing VERBOSE_IDE_CD_ERRORS define.  Make this config option enabled by
  default and visible only if CONFIG_EMBEDDED is defined.

before the patch:
   text    data     bss     dec     hex filename
  22841     360    1056   24257    5ec1 drivers/ide/ide-cd.o

after the patch w/ CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y:
   text    data     bss     dec     hex filename
  22857     360    1056   24273    5ed1 drivers/ide/ide-cd_mod.o

after the patch w/ CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=n:
   text    data     bss     dec     hex filename
  15091     360    1056   16507    407b drivers/ide/ide-cd_mod.o
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>

972560fb

ide-cd: coding style fixes for VERBOSE_IDE_CD_ERRORS code · 89d13ec7

由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008

* Coding style fixes for VERBOSE_IDE_CD_ERRORS code.

* Add KERN_{ERR,CONT} printk() levels where needed.

This is a preparation for moving this code out of ide-cd.[c,h].
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>

89d13ec7

ide-cd: remove duplicate sense keys definitions from ide-cd.h · 1b1215d5

由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008

ide-cd.c already uses sense keys definitions from <scsi/scsi.h>.
Acked-by: NSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1b1215d5

ide-cd: re-organize handling of quirky devices · e59724c7

由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008

Re-organize handling of quirky devices:

* Add struct cd_list_entry, ide_cd_quirks_list[] and ide_cd_flags() helper.

* Set flags returned by ide_cd_flags() in ide_cdrom_setup().

* Add IDE_CD_FLAG_VERTOS_{300_SDD,600_ESD} and IDE_CD_FLAG_SANYO_3CD flags.

* Move device quirks from ide_cdrom_setup() to ide_cd_quirks_list[].

* Rename IDE_CD_FLAG_NEC260 to IDE_CD_FLAG_PRE_ATAPI12 and handle
  quirky Stingray 8X CD-ROM using ide_cd_quirks_list[].

* Add IDE_CD_FLAG_FULL_CAPS_PAGE flag and handle quirky ACER 50X CD-ROM
  / WPI 32X CD-ROM using ide_cd_quirk_list[].

* Add IDE_CD_FLAG_PLAY_AUDIO_OK flag and handle quirky MATSHITA DVD-ROMs
  using ide_cd_quirks_list[].

* Add IDE_CD_FLAG_LE_SPEED_FIELDS flag and handle quirky ACER/AOpen 24X
  CD-ROM using ide_cd_quirk_list[].

* Fix some comments about quirky devices while at it.

There should be no functionality changes caused by this patch.
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>

e59724c7

ide-cd: use BCD2BIN()/BIN2BCD() macros from <linux/bcd.h> · 9a6dc668

由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008

Use BCD2BIN()/BIN2BCD() macros from <linux/bcd.h>
and remove the local bcd2bin()/bin2bcd() inlines.
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>

9a6dc668

ide-cd: remove STANDARD_ATAPI define · cdf6000d

由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008

Remove STANDARD_ATAPI define + drive-by coding style fixes.
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>

cdf6000d

ide-cd: remove NO_DOOR_LOCKING define · 3fc3cbf7

由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008

Acked-by: NSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>

3fc3cbf7

ide-cd: remove struct ide_cd_{config,state}_flags · 2bc4cf2d

由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008

* Remove unused ->{writing,reserved} fields from struct ide_cd_config_flags.

* Move ->max_speed from struct ide_cd_config_flags to struct cdrom_info.

* Move ->current_speed from struct ide_cd_state_flags to struct cdrom_info.

* Add defines for config and state flags.

* Add 'unsigned int cd_flags' to struct cdrom_info and use ->cd_flags
  instead of ->{config,state}_flags.

* Remove no longer needed struct ide_cd_{config,state}_flags.
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>

2bc4cf2d

ide-cd: remove struct atapi_capabilities_page (take 2) · 455d80a9

由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008

* Remove struct atapi_capabilities_page.

* Add ATAPI_CAPABILITIES_PAGE[_PAD]_SIZE define.

v2:
* The buf[] array access indexes were swapped between 'curspeed'/'maxspeed'.
  (Noticed by Borislav Petkov).

Cc: Borislav Petkov <bbpetkov@yahoo.de>
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>

455d80a9

ide-cd: kill CDROM_STATE_FLAGS() macro · 0ba11211

由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008

While at it rename 'info' variable to 'cd' in cdrom_saw_media_change().
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>

0ba11211

ide-cd: kill CDROM_CONFIG_FLAGS() macro · 4fe67178

由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008

While at it rename 'info' variable to 'cd' in
ide_cdrom_probe_capabilities() and ide_cdrom_setup().
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>

4fe67178

ide-cd: remove redundant config flags · 3f1b86d8

由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008

* Use CDC_* flags directly and remove redundant flags from ->config_flags.

While at it:
* Add KERN_CONT to printk()-s in ide_cdrom_probe_capabilities().
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>

3f1b86d8

ide-cd: add IDE_CD_CAPABILITIES define · 20e7f7ef

由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008

While at it remove stale/incorrect comment.
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>

20e7f7ef

ide-cd: cleanup ide_cdrom_update_speed() · 481c8c64

由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008

Acked-by: NSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>

481c8c64

ide-cd: remove struct atapi_{mechstat_header,changer_info,slot} · f18f960c

由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008

* Remove ->changer_info from struct cdrom_info (it is never allocated).

* Remove unused struct atapi_{mechstat_header,changer_info,slot}.
Acked-by: NSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>

f18f960c

ide-cd: remove unused and write-only struct ide_cd_config_flags fields · 2609d06d

由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008

unused fields:
* ->writing
* ->reserved

write-only fields:
* ->playmsf_as_bcd
* ->subchan_as_bcd
* ->test_write
* ->supp_disc_present
Acked-by: NSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>

2609d06d

ide-cd: remove needless zeroing of 'info' fields from ide_cdrom_setup() · b8d25dee

由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008

ide_cd_probe() zeroes 'info' prior to calling ide_cdrom_setup() so there
is no need to explicitly zero 'info' fields in the latter function.

Ditto for fields of CDROM_STATE_FLAGS(), CDROM_CONFIG_FLAGS() and 'cdi'
(all are embedded in 'info').
Acked-by: NSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>

b8d25dee

ide-cd: remove unused struct atapi_cdrom_subchnl · f17b0e02

由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008

Acked-by: NSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>

f17b0e02

ide-cd: remove dead code from cdrom_pc_intr() · 6229ac1f

由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008

Acked-by: NSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>

6229ac1f

ide-cd: remove unused defines from ide-cd.h · 9f8256db

由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008

Acked-by: NSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>

9f8256db

B
ide-cd: remove stale cdrom_transfer_packet_command() comment · 4415e871
由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008
```
Acked-by: NSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
```
4415e871
B
ide-cd: move historical changelog to Documentation/ide/ChangeLog.ide-cd.1994-2004 · 03553353
由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008
```
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
```
03553353

ide-cd: fix trailing whitespaces in changelog · cc6dbef2

由 Bartlomiej Zolnierkiewicz 提交于 2月 01, 2008

Acked-by: NSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>

cc6dbef2