Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 86792
b: refs/heads/master
c: 05680d8
h: refs/heads/master
v: v3
  • Loading branch information
Peter Osterlund authored and Linus Torvalds committed Mar 5, 2008
1 parent 0df5d89 commit 1eefcec
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 735c4fb916e9f83a9350aeb2680d77d01ea75094
refs/heads/master: 05680d86d21bdbe56db80c66c24c686590815f1f
21 changes: 13 additions & 8 deletions trunk/drivers/block/pktcdvd.c
Original file line number Diff line number Diff line change
Expand Up @@ -849,7 +849,8 @@ static int pkt_flush_cache(struct pktcdvd_device *pd)
/*
* speed is given as the normal factor, e.g. 4 for 4x
*/
static int pkt_set_speed(struct pktcdvd_device *pd, unsigned write_speed, unsigned read_speed)
static noinline_for_stack int pkt_set_speed(struct pktcdvd_device *pd,
unsigned write_speed, unsigned read_speed)
{
struct packet_command cgc;
struct request_sense sense;
Expand Down Expand Up @@ -1776,7 +1777,8 @@ static int pkt_get_track_info(struct pktcdvd_device *pd, __u16 track, __u8 type,
return pkt_generic_packet(pd, &cgc);
}

static int pkt_get_last_written(struct pktcdvd_device *pd, long *last_written)
static noinline_for_stack int pkt_get_last_written(struct pktcdvd_device *pd,
long *last_written)
{
disc_information di;
track_information ti;
Expand Down Expand Up @@ -1813,7 +1815,7 @@ static int pkt_get_last_written(struct pktcdvd_device *pd, long *last_written)
/*
* write mode select package based on pd->settings
*/
static int pkt_set_write_settings(struct pktcdvd_device *pd)
static noinline_for_stack int pkt_set_write_settings(struct pktcdvd_device *pd)
{
struct packet_command cgc;
struct request_sense sense;
Expand Down Expand Up @@ -1972,7 +1974,7 @@ static int pkt_writable_disc(struct pktcdvd_device *pd, disc_information *di)
return 1;
}

static int pkt_probe_settings(struct pktcdvd_device *pd)
static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd)
{
struct packet_command cgc;
unsigned char buf[12];
Expand Down Expand Up @@ -2071,7 +2073,8 @@ static int pkt_probe_settings(struct pktcdvd_device *pd)
/*
* enable/disable write caching on drive
*/
static int pkt_write_caching(struct pktcdvd_device *pd, int set)
static noinline_for_stack int pkt_write_caching(struct pktcdvd_device *pd,
int set)
{
struct packet_command cgc;
struct request_sense sense;
Expand Down Expand Up @@ -2116,7 +2119,8 @@ static int pkt_lock_door(struct pktcdvd_device *pd, int lockflag)
/*
* Returns drive maximum write speed
*/
static int pkt_get_max_speed(struct pktcdvd_device *pd, unsigned *write_speed)
static noinline_for_stack int pkt_get_max_speed(struct pktcdvd_device *pd,
unsigned *write_speed)
{
struct packet_command cgc;
struct request_sense sense;
Expand Down Expand Up @@ -2177,7 +2181,8 @@ static char us_clv_to_speed[16] = {
/*
* reads the maximum media speed from ATIP
*/
static int pkt_media_speed(struct pktcdvd_device *pd, unsigned *speed)
static noinline_for_stack int pkt_media_speed(struct pktcdvd_device *pd,
unsigned *speed)
{
struct packet_command cgc;
struct request_sense sense;
Expand Down Expand Up @@ -2249,7 +2254,7 @@ static int pkt_media_speed(struct pktcdvd_device *pd, unsigned *speed)
}
}

static int pkt_perform_opc(struct pktcdvd_device *pd)
static noinline_for_stack int pkt_perform_opc(struct pktcdvd_device *pd)
{
struct packet_command cgc;
struct request_sense sense;
Expand Down

0 comments on commit 1eefcec

Please sign in to comment.