All of lore.kernel.org
 help / color / mirror / Atom feed
From: maximilian attems <janitor@sternwelten.at>
To: Jeff Garzik <jgarzik@pobox.com>
Cc: Margit Schubert-While <margitsw@t-online.de>,
	Nishanth Aravamudan <nacc@us.ibm.com>,
	hvr@gnu.org, mcgrof@studorgs.rutgers.edu,
	kernel-janitors@lists.osdl.org, netdev@oss.sgi.com,
	Domen Puncer <domen@coderock.org>,
	linux-kernel@vger.kernel.org
Subject: [KJ] [patch 6/6] libata remove msleep_libata()
Date: Sun, 31 Oct 2004 14:45:24 +0000	[thread overview]
Message-ID: <20041031144524.GG28667@stro.at> (raw)
In-Reply-To: <41841886.2080609@pobox.com>

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




remove msleep_libata(), now that msleep() is backported.
also remove duplicate msleep() definition.
delay.h is already included.

Signed-off-by: Maximilian Attems <janitor@sternwelten.at>



---

 linux-2.4.28-rc1-max/drivers/scsi/libata-core.c |   23 -----------------------
 linux-2.4.28-rc1-max/include/linux/libata.h     |    1 -
 2 files changed, 24 deletions(-)

diff -puN drivers/scsi/libata-core.c~remove-libata_msleep drivers/scsi/libata-core.c
--- linux-2.4.28-rc1/drivers/scsi/libata-core.c~remove-libata_msleep	2004-10-31 14:06:49.000000000 +0100
+++ linux-2.4.28-rc1-max/drivers/scsi/libata-core.c	2004-10-31 14:08:41.000000000 +0100
@@ -67,28 +67,6 @@ MODULE_DESCRIPTION("Library module for A
 MODULE_LICENSE("GPL");
 
 /**
- *	msleep - sleep for a number of milliseconds
- *	@msecs: number of milliseconds to sleep
- *
- *	Issues schedule_timeout call for the specified number
- *	of milliseconds.
- *
- *	LOCKING:
- *	None.
- */
-
-static void msleep(unsigned long msecs)
-{
-	set_current_state(TASK_UNINTERRUPTIBLE);
-	schedule_timeout(msecs_to_jiffies(msecs) + 1);
-}
-
-void libata_msleep(unsigned long msecs)
-{
-	msleep(msecs);
-}
-
-/**
  *	ata_tf_load - send taskfile registers to host controller
  *	@ap: Port to which output is sent
  *	@tf: ATA taskfile register set
@@ -3697,7 +3675,6 @@ EXPORT_SYMBOL_GPL(ata_scsi_queuecmd);
 EXPORT_SYMBOL_GPL(ata_scsi_error);
 EXPORT_SYMBOL_GPL(ata_scsi_detect);
 EXPORT_SYMBOL_GPL(ata_add_to_probe_list);
-EXPORT_SYMBOL_GPL(libata_msleep);
 EXPORT_SYMBOL_GPL(ata_scsi_release);
 EXPORT_SYMBOL_GPL(ata_host_intr);
 EXPORT_SYMBOL_GPL(ata_dev_classify);
diff -puN include/linux/libata.h~remove-libata_msleep include/linux/libata.h
--- linux-2.4.28-rc1/include/linux/libata.h~remove-libata_msleep	2004-10-31 14:06:49.000000000 +0100
+++ linux-2.4.28-rc1-max/include/linux/libata.h	2004-10-31 14:09:08.000000000 +0100
@@ -416,7 +416,6 @@ extern void ata_qc_complete(struct ata_q
 extern void ata_eng_timeout(struct ata_port *ap);
 extern void ata_add_to_probe_list (struct ata_probe_ent *probe_ent);
 extern int ata_std_bios_param(Disk * disk, kdev_t dev, int *ip);
-extern void libata_msleep(unsigned long msecs);
 
 
 static inline unsigned int ata_tag_valid(unsigned int tag)
_

[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

WARNING: multiple messages have this Message-ID (diff)
From: maximilian attems <janitor@sternwelten.at>
To: Jeff Garzik <jgarzik@pobox.com>
Cc: Margit Schubert-While <margitsw@t-online.de>,
	Nishanth Aravamudan <nacc@us.ibm.com>,
	hvr@gnu.org, mcgrof@studorgs.rutgers.edu,
	kernel-janitors@lists.osdl.org, netdev@oss.sgi.com,
	Domen Puncer <domen@coderock.org>,
	linux-kernel@vger.kernel.org
Subject: [patch 6/6] libata remove msleep_libata()
Date: Sun, 31 Oct 2004 15:45:24 +0100	[thread overview]
Message-ID: <20041031144524.GG28667@stro.at> (raw)
In-Reply-To: <41841886.2080609@pobox.com>




remove msleep_libata(), now that msleep() is backported.
also remove duplicate msleep() definition.
delay.h is already included.

Signed-off-by: Maximilian Attems <janitor@sternwelten.at>



---

 linux-2.4.28-rc1-max/drivers/scsi/libata-core.c |   23 -----------------------
 linux-2.4.28-rc1-max/include/linux/libata.h     |    1 -
 2 files changed, 24 deletions(-)

diff -puN drivers/scsi/libata-core.c~remove-libata_msleep drivers/scsi/libata-core.c
--- linux-2.4.28-rc1/drivers/scsi/libata-core.c~remove-libata_msleep	2004-10-31 14:06:49.000000000 +0100
+++ linux-2.4.28-rc1-max/drivers/scsi/libata-core.c	2004-10-31 14:08:41.000000000 +0100
@@ -67,28 +67,6 @@ MODULE_DESCRIPTION("Library module for A
 MODULE_LICENSE("GPL");
 
 /**
- *	msleep - sleep for a number of milliseconds
- *	@msecs: number of milliseconds to sleep
- *
- *	Issues schedule_timeout call for the specified number
- *	of milliseconds.
- *
- *	LOCKING:
- *	None.
- */
-
-static void msleep(unsigned long msecs)
-{
-	set_current_state(TASK_UNINTERRUPTIBLE);
-	schedule_timeout(msecs_to_jiffies(msecs) + 1);
-}
-
-void libata_msleep(unsigned long msecs)
-{
-	msleep(msecs);
-}
-
-/**
  *	ata_tf_load - send taskfile registers to host controller
  *	@ap: Port to which output is sent
  *	@tf: ATA taskfile register set
@@ -3697,7 +3675,6 @@ EXPORT_SYMBOL_GPL(ata_scsi_queuecmd);
 EXPORT_SYMBOL_GPL(ata_scsi_error);
 EXPORT_SYMBOL_GPL(ata_scsi_detect);
 EXPORT_SYMBOL_GPL(ata_add_to_probe_list);
-EXPORT_SYMBOL_GPL(libata_msleep);
 EXPORT_SYMBOL_GPL(ata_scsi_release);
 EXPORT_SYMBOL_GPL(ata_host_intr);
 EXPORT_SYMBOL_GPL(ata_dev_classify);
diff -puN include/linux/libata.h~remove-libata_msleep include/linux/libata.h
--- linux-2.4.28-rc1/include/linux/libata.h~remove-libata_msleep	2004-10-31 14:06:49.000000000 +0100
+++ linux-2.4.28-rc1-max/include/linux/libata.h	2004-10-31 14:09:08.000000000 +0100
@@ -416,7 +416,6 @@ extern void ata_qc_complete(struct ata_q
 extern void ata_eng_timeout(struct ata_port *ap);
 extern void ata_add_to_probe_list (struct ata_probe_ent *probe_ent);
 extern int ata_std_bios_param(Disk * disk, kdev_t dev, int *ip);
-extern void libata_msleep(unsigned long msecs);
 
 
 static inline unsigned int ata_tag_valid(unsigned int tag)
_

  parent reply	other threads:[~2004-10-31 14:45 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-09-23 22:13 [Kernel-janitors] [PATCH 2.6.9-rc2 17/38] net/islpci_dev: replace Nishanth Aravamudan
2004-09-23 22:55 ` [Kernel-janitors] Re: [PATCH 2.6.9-rc2 17/38] net/islpci_dev: Luis R. Rodriguez
2004-09-23 22:55   ` [PATCH 2.6.9-rc2 17/38] net/islpci_dev: replace schedule_timeout() with msleep() Luis R. Rodriguez
2004-09-24  7:43   ` [Kernel-janitors] Re: [PATCH 2.6.9-rc2 17/38] net/islpci_dev: Margit Schubert-While
2004-09-24  7:43     ` [PATCH 2.6.9-rc2 17/38] net/islpci_dev: replace schedule_timeout() with msleep() Margit Schubert-While
2004-09-24 16:34     ` [Kernel-janitors] [PATCH 2.6.9-rc2 17/38] net/islpci_dev: replace maximilian attems
2004-09-24 16:34       ` [Kernel-janitors] [PATCH 2.6.9-rc2 17/38] net/islpci_dev: replace schedule_timeout() with msleep() maximilian attems
2004-10-01  4:15     ` [Kernel-janitors] Re: [PATCH 2.6.9-rc2 17/38] net/islpci_dev: Jeff Garzik
2004-10-01  4:15       ` [PATCH 2.6.9-rc2 17/38] net/islpci_dev: replace schedule_timeout() with msleep() Jeff Garzik
2004-10-01  7:04       ` [Kernel-janitors] Re: [PATCH 2.6.9-rc2 17/38] net/islpci_dev: Margit Schubert-While
2004-10-01  7:04         ` [PATCH 2.6.9-rc2 17/38] net/islpci_dev: replace schedule_timeout() with msleep() Margit Schubert-While
2004-10-01 16:55         ` [Kernel-janitors] Re: [PATCH 2.6.9-rc2 17/38] net/islpci_dev: Greg KH
2004-10-01 16:55           ` [Kernel-janitors] Re: [PATCH 2.6.9-rc2 17/38] net/islpci_dev: replace schedule_timeout() with msleep() Greg KH
2004-10-02  9:07           ` [Kernel-janitors] Re: [PATCH 2.6.9-rc2 17/38] Margit Schubert-While
2004-10-02  9:07             ` [Kernel-janitors] Re: [PATCH 2.6.9-rc2 17/38] net/islpci_dev: replace schedule_timeout() with msleep() Margit Schubert-While
2004-10-04 21:04             ` [Kernel-janitors] Re: [PATCH 2.6.9-rc2 17/38] net/islpci_dev: Jeff Garzik
2004-10-04 21:04               ` [Kernel-janitors] Re: [PATCH 2.6.9-rc2 17/38] net/islpci_dev: replace schedule_timeout() with msleep() Jeff Garzik
2004-10-30 22:22       ` [KJ] [patch 2.4] back port msleep(), msleep_interruptible() maximilian attems
2004-10-30 22:22         ` maximilian attems
2004-10-30 22:22         ` maximilian attems
2004-10-30 22:41         ` [KJ] " Jeff Garzik
2004-10-30 22:41           ` Jeff Garzik
2004-10-30 22:41           ` Jeff Garzik
2004-10-30 22:59           ` [KJ] " Nish Aravamudan
2004-10-30 22:59             ` Nish Aravamudan
2004-10-30 23:19             ` maximilian attems
2004-10-30 23:19             ` maximilian attems
2004-10-30 23:19               ` maximilian attems
2004-10-30 23:19             ` maximilian attems
2004-10-30 22:59           ` Nish Aravamudan
2004-10-30 22:59           ` Nish Aravamudan
2004-10-31 14:43           ` maximilian attems
2004-10-31 14:43             ` maximilian attems
2004-10-31 14:43           ` maximilian attems
2004-10-31 14:43           ` maximilian attems
2004-10-31 14:44           ` [KJ] [patch 1/6] " maximilian attems
2004-10-31 14:44             ` maximilian attems
2004-10-31 14:44             ` maximilian attems
2004-10-31 14:44           ` [KJ] [patch 2/6] libata remove duplicate definition maximilian attems
2004-10-31 14:44             ` [patch 2/6] libata remove duplicate definition msecs_to_jiffies() maximilian attems
2004-10-31 14:44           ` [KJ] [patch 3/6] sx8 remove duplicate definition msleep(), maximilian attems
2004-10-31 14:44             ` [patch 3/6] sx8 remove duplicate definition msleep(), msecs_to_jiffies() maximilian attems
2004-10-31 14:45           ` [KJ] [patch 4/6] char/shwdt remove duplicate msecs_to_jiffies() maximilian attems
2004-10-31 14:45             ` maximilian attems
2004-10-31 14:45           ` [KJ] [patch 5/6] sata_promise remove duplicate msleep() definition maximilian attems
2004-10-31 14:45             ` maximilian attems
2004-10-31 14:45           ` maximilian attems [this message]
2004-10-31 14:45             ` [patch 6/6] libata remove msleep_libata() maximilian attems

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20041031144524.GG28667@stro.at \
    --to=janitor@sternwelten.at \
    --cc=domen@coderock.org \
    --cc=hvr@gnu.org \
    --cc=jgarzik@pobox.com \
    --cc=kernel-janitors@lists.osdl.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=margitsw@t-online.de \
    --cc=mcgrof@studorgs.rutgers.edu \
    --cc=nacc@us.ibm.com \
    --cc=netdev@oss.sgi.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.