[PATCH] 2.5.21 kill warnings 3/19

Martin Dalecki
2002-06-10T12:23:27Z

[-- Attachment #1: Type: text/plain, Size: 82 bytes --]

Kill unused variables in legacy cdrom drivers,
after the janitorial patch got in.

[-- Attachment #2: warn-2.5.21-3.diff --]
[-- Type: text/plain, Size: 1116 bytes --]

diff -urN linux-2.5.21/drivers/cdrom/optcd.c linux/drivers/cdrom/optcd.c
--- linux-2.5.21/drivers/cdrom/optcd.c 2002-06-09 07:28:11.000000000 +0200
+++ linux/drivers/cdrom/optcd.c 2002-06-09 19:15:18.000000000 +0200
@@ -1507,7 +1507,6 @@

static int cdromreadtochdr(unsigned long arg)
{
- int status;
struct cdrom_tochdr tochdr;

tochdr.cdth_trk0 = disk_info.first;
@@ -1519,7 +1518,6 @@

static int cdromreadtocentry(unsigned long arg)
{
- int status;
struct cdrom_tocentry entry;
struct cdrom_subchnl *tocptr;

@@ -1646,7 +1644,6 @@
#ifdef MULTISESSION
static int cdrommultisession(unsigned long arg)
{
- int status;
struct cdrom_multisession ms;

if (copy_from_user(&ms, (void*) arg, sizeof ms))
diff -urN linux-2.5.21/drivers/cdrom/sonycd535.c linux/drivers/cdrom/sonycd535.c
--- linux-2.5.21/drivers/cdrom/sonycd535.c 2002-06-09 07:28:49.000000000 +0200
+++ linux/drivers/cdrom/sonycd535.c 2002-06-09 19:00:00.000000000 +0200
@@ -1012,7 +1012,6 @@
sony_get_subchnl_info(long arg)
{
struct cdrom_subchnl schi;
- int err;

/* Get attention stuff */
if (check_drive_status() != 0)