- hptiop-highpoint-rocketraid-3xxx-controller-driver-list-locking-updates.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled

     hptiop-highpoint-rocketraid-3xxx-controller-driver-list-locking-updates

has been removed from the -mm tree.  Its filename is

     hptiop-highpoint-rocketraid-3xxx-controller-driver-list-locking-updates.patch

This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.

------------------------------------------------------
Subject: hptiop-highpoint-rocketraid-3xxx-controller-driver-list-locking-updates
From: Andrew Morton <akpm@xxxxxxxx>


- Fix debug printks

- uninline function with multiple callsites

- coding style fixups

- remove unneeded casts of void*

- Note that atomic_xchg isn't _really- available on all architectures.  But
  afaict only UML is missing it now.

Cc: HighPoint Linux Team <linux@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 drivers/scsi/hptiop.c |  133 ++++++++++++++++++++--------------------
 1 files changed, 67 insertions(+), 66 deletions(-)

diff -puN drivers/scsi/hptiop.c~hptiop-highpoint-rocketraid-3xxx-controller-driver-list-locking-updates drivers/scsi/hptiop.c
--- 25/drivers/scsi/hptiop.c~hptiop-highpoint-rocketraid-3xxx-controller-driver-list-locking-updates	Fri May 12 09:59:39 2006
+++ 25-akpm/drivers/scsi/hptiop.c	Fri May 12 09:59:39 2006
@@ -49,11 +49,11 @@ static DEFINE_SPINLOCK(hptiop_hba_list_l
 static LIST_HEAD(hptiop_hba_list);
 static int hptiop_cdev_major = -1;
 
-static void hptiop_host_request_callback(struct hptiop_hba * hba, u32 tag);
-static void hptiop_iop_request_callback(struct hptiop_hba * hba, u32 tag);
-static void hptiop_message_callback(struct hptiop_hba * hba, u32 msg);
+static void hptiop_host_request_callback(struct hptiop_hba *hba, u32 tag);
+static void hptiop_iop_request_callback(struct hptiop_hba *hba, u32 tag);
+static void hptiop_message_callback(struct hptiop_hba *hba, u32 msg);
 
-static int iop_wait_ready(struct hpt_iopmu __iomem * iop, u32 millisec)
+static int iop_wait_ready(struct hpt_iopmu __iomem *iop, u32 millisec)
 {
 	u32 req = 0;
 	int i;
@@ -73,7 +73,7 @@ static int iop_wait_ready(struct hpt_iop
 	return -1;
 }
 
-static void inline hptiop_request_callback(struct hptiop_hba * hba, u32 tag)
+static void hptiop_request_callback(struct hptiop_hba *hba, u32 tag)
 {
 	if ((tag & IOPMU_QUEUE_MASK_HOST_BITS) == IOPMU_QUEUE_ADDR_HOST_BIT)
 		return hptiop_host_request_callback(hba,
@@ -82,7 +82,7 @@ static void inline hptiop_request_callba
 		return hptiop_iop_request_callback(hba, tag);
 }
 
-static inline void hptiop_drain_outbound_queue(struct hptiop_hba * hba)
+static inline void hptiop_drain_outbound_queue(struct hptiop_hba *hba)
 {
 	u32 req;
 
@@ -108,9 +108,9 @@ static inline void hptiop_drain_outbound
 	}
 }
 
-static int __iop_intr(struct hptiop_hba * hba)
+static int __iop_intr(struct hptiop_hba *hba)
 {
-	struct hpt_iopmu __iomem * iop = hba->iop;
+	struct hpt_iopmu __iomem *iop = hba->iop;
 	u32 status;
 	int ret = 0;
 
@@ -132,10 +132,10 @@ static int __iop_intr(struct hptiop_hba 
 	return ret;
 }
 
-static int iop_send_sync_request(struct hptiop_hba * hba,
-					void __iomem * _req, u32 millisec)
+static int iop_send_sync_request(struct hptiop_hba *hba,
+					void __iomem *_req, u32 millisec)
 {
-	struct hpt_iop_request_header __iomem * req = _req;
+	struct hpt_iop_request_header __iomem *req = _req;
 	u32 i;
 
 	writel(readl(&req->flags) | IOP_REQUEST_FLAG_SYNC_REQUEST,
@@ -156,7 +156,7 @@ static int iop_send_sync_request(struct 
 	return -1;
 }
 
-static int iop_send_sync_msg(struct hptiop_hba * hba, u32 msg, u32 millisec)
+static int iop_send_sync_msg(struct hptiop_hba *hba, u32 msg, u32 millisec)
 {
 	u32 i;
 
@@ -174,11 +174,11 @@ static int iop_send_sync_msg(struct hpti
 	return hba->msg_done? 0 : -1;
 }
 
-static int iop_get_config(struct hptiop_hba * hba,
-				struct hpt_iop_request_get_config * config)
+static int iop_get_config(struct hptiop_hba *hba,
+				struct hpt_iop_request_get_config *config)
 {
 	u32 req32;
-	struct hpt_iop_request_get_config __iomem * req;
+	struct hpt_iop_request_get_config __iomem *req;
 
 	req32 = readl(&hba->iop->inbound_queue);
 	if (req32 == IOPMU_QUEUE_EMPTY)
@@ -202,11 +202,11 @@ static int iop_get_config(struct hptiop_
 	return 0;
 }
 
-static int iop_set_config(struct hptiop_hba * hba,
-				struct hpt_iop_request_set_config * config)
+static int iop_set_config(struct hptiop_hba *hba,
+				struct hpt_iop_request_set_config *config)
 {
 	u32 req32;
-	struct hpt_iop_request_set_config __iomem * req;
+	struct hpt_iop_request_set_config __iomem *req;
 
 	req32 = readl(&hba->iop->inbound_queue);
 	if (req32 == IOPMU_QUEUE_EMPTY)
@@ -234,9 +234,9 @@ static int iop_set_config(struct hptiop_
 	return 0;
 }
 
-static int hptiop_initialize_iop(struct hptiop_hba * hba)
+static int hptiop_initialize_iop(struct hptiop_hba *hba)
 {
-	struct hpt_iopmu __iomem *  iop = hba->iop;
+	struct hpt_iopmu __iomem *iop = hba->iop;
 
 	/* enable interrupts */
 	writel(~(IOPMU_OUTBOUND_INT_POSTQUEUE|IOPMU_OUTBOUND_INT_MSG0),
@@ -254,11 +254,11 @@ static int hptiop_initialize_iop(struct 
 	return 0;
 }
 
-static int hptiop_map_pci_bar(struct hptiop_hba * hba)
+static int hptiop_map_pci_bar(struct hptiop_hba *hba)
 {
 	u8 cmd;
 	u32 mem_base_phy, length;
-	void __iomem * mem_base_virt;
+	void __iomem *mem_base_virt;
 	struct pci_dev *pcidev = hba->pcidev;
 
 	pci_read_config_byte(pcidev, PCI_COMMAND, &cmd);
@@ -287,7 +287,7 @@ static int hptiop_map_pci_bar(struct hpt
 	return 0;
 }
 
-static void hptiop_message_callback(struct hptiop_hba * hba, u32 msg)
+static void hptiop_message_callback(struct hptiop_hba *hba, u32 msg)
 {
 	dprintk("iop message 0x%x\n", msg);
 
@@ -302,9 +302,9 @@ static void hptiop_message_callback(stru
 		hba->msg_done = 1;
 }
 
-static inline struct hptiop_request * get_req(struct hptiop_hba * hba)
+static inline struct hptiop_request *get_req(struct hptiop_hba *hba)
 {
-	struct hptiop_request * ret;
+	struct hptiop_request *ret;
 
 	dprintk("get_req : req=%p\n", hba->req_list);
 
@@ -322,13 +322,13 @@ static inline void free_req(struct hptio
 	hba->req_list = req;
 }
 
-static void hptiop_host_request_callback(struct hptiop_hba * hba, u32 tag)
+static void hptiop_host_request_callback(struct hptiop_hba *hba, u32 tag)
 {
-	struct hpt_iop_request_scsi_command * req;
+	struct hpt_iop_request_scsi_command *req;
 	struct scsi_cmnd *scp;
 
 	req = (struct hpt_iop_request_scsi_command *)hba->reqs[tag].req_virt;
-	dprintk("hptiop_request_callback: req=%p, type=%d, "
+	dprintk("hptiop_host_request_callback: req=%p, type=%d, "
 			"result=%d, context=0x%x tag=%d\n",
 			req, req->header.type, req->header.result,
 			req->header.context, tag);
@@ -392,15 +392,15 @@ static void hptiop_host_request_callback
 	atomic_dec(&hba->outstandingcommands);
 }
 
-void hptiop_iop_request_callback(struct hptiop_hba * hba, u32 tag)
+void hptiop_iop_request_callback(struct hptiop_hba *hba, u32 tag)
 {
-	struct hpt_iop_request_header __iomem * req;
-	struct hpt_iop_request_ioctl_command __iomem * p;
+	struct hpt_iop_request_header __iomem *req;
+	struct hpt_iop_request_ioctl_command __iomem *p;
 	struct hpt_ioctl_k *arg;
 
 	req = (struct hpt_iop_request_header __iomem *)
 			((unsigned long)hba->iop + tag);
-	dprintk("hptiop_request_callback: req=%p, type=%d, "
+	dprintk("hptiop_iop_request_callback: req=%p, type=%d, "
 			"result=%d, context=0x%x tag=%d\n",
 			req, readl(&req->type), readl(&req->result),
 			readl(&req->context), tag);
@@ -433,7 +433,7 @@ void hptiop_iop_request_callback(struct 
 
 static irqreturn_t hptiop_intr(int irq, void *dev_id, struct pt_regs *regs)
 {
-	struct hptiop_hba * hba = (struct hptiop_hba *)dev_id;
+	struct hptiop_hba  *hba = dev_id;
 	int  handled = 0;
 	unsigned long flags;
 
@@ -501,14 +501,14 @@ static int hptiop_buildsgl(struct scsi_c
 	return sg_count;
 }
 
-static int hptiop_queuecommand(struct scsi_cmnd * scp,
-				void (*done) (struct scsi_cmnd *))
+static int hptiop_queuecommand(struct scsi_cmnd *scp,
+				void (*done)(struct scsi_cmnd *))
 {
 	struct Scsi_Host *host = scp->device->host;
-	struct hptiop_hba * hba = (struct hptiop_hba *)host->hostdata;
-	struct hpt_iop_request_scsi_command * req;
+	struct hptiop_hba *hba = (struct hptiop_hba *)host->hostdata;
+	struct hpt_iop_request_scsi_command *req;
 	int sg_count = 0;
-	struct hptiop_request * _req;
+	struct hptiop_request *_req;
 
 	BUG_ON(!done);
 	scp->scsi_done = done;
@@ -598,7 +598,7 @@ static int hptiop_abort(struct scsi_cmnd
 	return FAILED;
 }
 
-static int hptiop_reset_hba(struct hptiop_hba * hba)
+static int hptiop_reset_hba(struct hptiop_hba *hba)
 {
 	if (atomic_xchg(&hba->resetting, 1) == 0) {
 		atomic_inc(&hba->reset_count);
@@ -808,19 +808,21 @@ static inline int __hpt_do_ioctl(struct 
 
 #define hpt_id_valid(id) ((id) && ((u32)(id) != 0xffffffff))
 
-static int hptiop_get_controller_info(struct hptiop_hba * hba,
-					struct hpt_controller_info * pinfo)
+static int hptiop_get_controller_info(struct hptiop_hba *hba,
+					struct hpt_controller_info *pinfo)
 {
 	int id = 0;
+
 	return __hpt_do_ioctl(hba, HPT_IOCTL_GET_CONTROLLER_INFO,
 		&id, sizeof(int), pinfo, sizeof(*pinfo));
 }
 
 
-static int hptiop_get_channel_info(struct hptiop_hba * hba, int bus,
-					struct hpt_channel_info * pinfo)
+static int hptiop_get_channel_info(struct hptiop_hba *hba, int bus,
+					struct hpt_channel_info *pinfo)
 {
 	u32 ids[2];
+
 	ids[0] = 0;
 	ids[1] = bus;
 	return __hpt_do_ioctl(hba, HPT_IOCTL_GET_CHANNEL_INFO,
@@ -828,8 +830,8 @@ static int hptiop_get_channel_info(struc
 
 }
 
-static int hptiop_get_logical_devices(struct hptiop_hba * hba,
-					hpt_id_t * pids, int maxcount)
+static int hptiop_get_logical_devices(struct hptiop_hba *hba,
+					hpt_id_t *pids, int maxcount)
 {
 	int i;
 	u32 count = maxcount - 1;
@@ -846,15 +848,15 @@ static int hptiop_get_logical_devices(st
 	return maxcount;
 }
 
-static int hptiop_get_device_info_v3(struct hptiop_hba * hba,
-			hpt_id_t id, struct hpt_logical_device_info_v3 * pinfo)
+static int hptiop_get_device_info_v3(struct hptiop_hba *hba, hpt_id_t id,
+				struct hpt_logical_device_info_v3 *pinfo)
 {
 	return __hpt_do_ioctl(hba, HPT_IOCTL_GET_DEVICE_INFO_V3,
 				&id, sizeof(hpt_id_t),
 				pinfo, sizeof(*pinfo));
 }
 
-static const char *get_array_status(struct hpt_logical_device_info_v3 * devinfo)
+static const char *get_array_status(struct hpt_logical_device_info_v3 *devinfo)
 {
 	static char s[64];
 	u32 flags = devinfo->u.array.flags;
@@ -912,7 +914,7 @@ static const char *get_array_status(stru
 	return s;
 }
 
-static void hptiop_dump_devinfo(struct hptiop_hba * hba,
+static void hptiop_dump_devinfo(struct hptiop_hba *hba,
 			struct hptiop_getinfo *pinfo, hpt_id_t id, int indent)
 {
 	struct hpt_logical_device_info_v3 devinfo;
@@ -983,8 +985,7 @@ static void hptiop_dump_devinfo(struct h
 				devinfo.u.array.array_type==AT_JBOD? "JBOD" :
 					"unknown",
 			capacity,
-			get_array_status(&devinfo)
-		);
+			get_array_status(&devinfo));
 		for (i = 0; i < devinfo.u.array.ndisk; i++) {
 			if (hpt_id_valid(devinfo.u.array.members[i])) {
 				if ((1<<i) & devinfo.u.array.critical_members)
@@ -1009,10 +1010,10 @@ static ssize_t hptiop_show_version(struc
 	return snprintf(buf, PAGE_SIZE, "%s\n", driver_ver);
 }
 
-static ssize_t hptiop_cdev_read(struct file * filp,
-				char __user * buf, size_t count, loff_t *ppos)
+static ssize_t hptiop_cdev_read(struct file *filp, char __user *buf,
+				size_t count, loff_t *ppos)
 {
-	struct hptiop_hba * hba = filp->private_data;
+	struct hptiop_hba *hba = filp->private_data;
 	struct hptiop_getinfo info;
 	int i, j, ndev;
 	struct hpt_controller_info con_info;
@@ -1172,8 +1173,8 @@ static struct file_operations hptiop_cde
 
 static ssize_t hptiop_show_fw_version(struct class_device *class_dev, char *buf)
 {
-	struct Scsi_Host * host = class_to_shost(class_dev);
-	struct hptiop_hba * hba = (struct hptiop_hba *)host->hostdata;
+	struct Scsi_Host *host = class_to_shost(class_dev);
+	struct hptiop_hba *hba = (struct hptiop_hba *)host->hostdata;
 
 	return snprintf(buf, PAGE_SIZE, "%d.%d.%d.%d\n",
 				hba->firmware_version >> 24,
@@ -1224,12 +1225,12 @@ static struct scsi_host_template driver_
 static int __devinit hptiop_probe(struct pci_dev *pcidev,
 					const struct pci_device_id *id)
 {
-	struct Scsi_Host * host = NULL;
-	struct hptiop_hba * hba;
-	struct hpt_iop_request_get_config  iop_config;
-	struct hpt_iop_request_set_config  set_config;
+	struct Scsi_Host *host = NULL;
+	struct hptiop_hba *hba;
+	struct hpt_iop_request_get_config iop_config;
+	struct hpt_iop_request_set_config set_config;
 	dma_addr_t start_phy;
-	void * start_virt;
+	void *start_virt;
 	u32 offset, i, req_size;
 
 	dprintk("hptiop_probe(%p)\n", pcidev);
@@ -1418,9 +1419,9 @@ disable_pci_device:
 
 static void hptiop_shutdown(struct pci_dev *pcidev)
 {
-	struct Scsi_Host * host = pci_get_drvdata(pcidev);
-	struct hptiop_hba * hba = (struct hptiop_hba *)host->hostdata;
-	struct hpt_iopmu __iomem * iop = hba->iop;
+	struct Scsi_Host *host = pci_get_drvdata(pcidev);
+	struct hptiop_hba *hba = (struct hptiop_hba *)host->hostdata;
+	struct hpt_iopmu __iomem *iop = hba->iop;
 	u32    int_mask;
 
 	dprintk("hptiop_shutdown(%p)\n", hba);
@@ -1443,8 +1444,8 @@ static void hptiop_shutdown(struct pci_d
 
 static void hptiop_remove(struct pci_dev *pcidev)
 {
-	struct Scsi_Host * host = pci_get_drvdata(pcidev);
-	struct hptiop_hba * hba = (struct hptiop_hba *)host->hostdata;
+	struct Scsi_Host *host = pci_get_drvdata(pcidev);
+	struct hptiop_hba *hba = (struct hptiop_hba *)host->hostdata;
 
 	dprintk("scsi%d: hptiop_remove\n", hba->host->host_no);
 
_

Patches currently in -mm which might be from akpm@xxxxxxxx are

ext3-resize-fix-double-unlock_super.patch
tpm-more-bios-log-parsing-fixes-tidy.patch
revert-swsusp-add-check-for-suspension-of-x-controlled-devices.patch
git-acpi.patch
acpi-update-asus_acpi-driver-registration-fix.patch
catch-notification-of-memory-add-event-of-acpi-via-container-driver-register-start-func-for-memory-device.patch
catch-notification-of-memory-add-event-of-acpi-via-container-driveravoid-redundant-call-add_memory.patch
acpi-dock-driver-interface-fixups.patch
acpi-atlas-acpi-driver-v2-tidy.patch
remove-for_each_cpu.patch
sony_apci-resume.patch
uninorth-agp-warning-fixes.patch
alpha-agp-warning-fix.patch
kauditd_thread-warning-fix.patch
powernow-k8-crash-workaround.patch
git-dvb.patch
scx200_acb-use-pci-i-o-resource-when-appropriate-fix.patch
git-gfs2.patch
git-infiniband.patch
via-pmu-add-input-device-tidy.patch
git-klibc.patch
git-hdrcleanup-fixup.patch
git-hdrcleanup-vs-git-klibc-on-ia64.patch
git-hdrcleanup-vs-git-klibc-on-ia64-2.patch
git-hdrinstall-fixup.patch
git-libata-all.patch
git-libata-all-data_xfer-fixes.patch
libata-reduce-timeouts.patch
sdhci-truncated-pointer-fix.patch
git-mtd.patch
git-mtd-fixup.patch
git-netdev-all.patch
smc911x-Kconfig-fix.patch
pci-error-recovery-e1000-network-device-driver.patch
git-net.patch
git-nfs-fixup.patch
git-powerpc.patch
powerpc-kbuild-warning-fix.patch
git-rbtree.patch
git-sas.patch
gregkh-pci-pci-64-bit-resources-drivers-others-changes-amba-fix.patch
kconfigurable-resources-core-changes-i386-fix.patch
kconfigurable-resources-core-changes-fix.patch
kconfigurable-resources-arch-dependent-changes-arch-a-i-fix.patch
typesh-sector_t-and-blkcnt_t-arent-for-userspace.patch
kconfigurable-resources-mtd-fixes.patch
bogus-disk-geometry-on-large-disks-warning-fix.patch
areca-raid-linux-scsi-driver-update6-for-2617-rc1-mm3-externs-go-in-headers.patch
git-scsi-target-fixup.patch
git-scsi-target-warning-fix.patch
revert-gregkh-usb-usb-ohci-avoids-root-hub-timer-polling.patch
gregkh-usb-usb-serial-mos7720-powerpc-wrokaround.patch
driver-for-apple-cinema-display-tweaks.patch
git-supertrak-fixup.patch
x86_64-reliable-stack-trace-support-i386-fix.patch
x86_64-dont-warn-for-overflow-in-nommu-case-when-dma_mask-is-32bit-fix.patch
xfs-sparc32-build-fix.patch
pg_uncached-is-ia64-only.patch
page-migration-simplify-migrate_pages-tweaks.patch
acx1xx-wireless-driver.patch
tiacx-pci-build-fix.patch
x86-kernel-irq-balancer-fix-tidy.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-tidy.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-arch_vma_name-fix.patch
prune_one_dentry-tweaks.patch
mmput-might-sleep.patch
jbd-avoid-kfree-null.patch
ext3_clear_inode-avoid-kfree-null.patch
leds-amstrad-delta-led-support-tidy.patch
connector-exports.patch
config_net=n-build-fix.patch
rewritten-backlight-infrastructure-for-portable-apple-computers-fix.patch
allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-fix.patch
allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-tidy.patch
deprecate-smbfs-in-favour-of-cifs.patch
msnd-section-fix.patch
openpromfs-factorize-out-tidy.patch
add-export_unused_symbol-and-export_unused_symbol_gpl-default.patch
kernel-sysc-cleanups-fix.patch
cpqarray-section-fix.patch
pdflush-handle-resume-wakeups.patch
schedule_on_each_cpu-reduce-kmalloc-size.patch
keys-fix-race-between-two-instantiators-of-a-key-tidy.patch
per-task-delay-accounting-proc-export-of-aggregated-block-i-o-delays-warning-fix.patch
add-via-hw-rng-driver-fix.patch
hangcheck-remove-monotomic_clock-on-x86.patch
swap-prefetch-fix-lru_cache_add_tail-tidy.patch
mark-address_space_operations-const-vs-ecryptfs-mmap-operations.patch
ecryptfs-alpha-build-fix.patch
namespaces-add-nsproxy-dont-include-compileh.patch
namespaces-utsname-switch-to-using-uts-namespaces-alpha-fix.patch
namespaces-utsname-implement-utsname-namespaces-export.patch
namespaces-utsname-implement-utsname-namespaces-dont-include-compileh.patch
ide_dma_speed-fixes-warning-fix.patch
ide_dma_speed-fixes-tidy.patch
hpt3xx-rework-rate-filtering-tidy.patch
savagefb-add-state-save-and_restore-hooks-tidy.patch
lib-add-idr_replace-tidy.patch
genirq-rename-desc-handler-to-desc-chip-power-fix.patch
genirq-rename-desc-handler-to-desc-chip-ia64-fix.patch
genirq-rename-desc-handler-to-desc-chip-ia64-fix-2.patch
genirq-convert-the-i386-architecture-to-irq-chips-fix-2.patch
kgdb-core-lite-add-reboot-command.patch
kgdb-8250-fix.patch
nr_blockdev_pages-in_interrupt-warning.patch
device-suspend-debug.patch
revert-tty-buffering-comment-out-debug-code.patch
slab-leaks3-default-y.patch
x86-kmap_atomic-debugging.patch
profile-likely-unlikely-macros-tidy.patch
profile-likely-unlikely-macros-fix.patch
profile-likely-unlikely-macros-fix-2.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux